diff --git a/common/client-core/src/client/base_client/non_wasm_helpers.rs b/common/client-core/src/client/base_client/non_wasm_helpers.rs
index cd61760d3c..b9b08e6001 100644
--- a/common/client-core/src/client/base_client/non_wasm_helpers.rs
+++ b/common/client-core/src/client/base_client/non_wasm_helpers.rs
@@ -105,7 +105,7 @@ async fn archive_corrupted_database<P: AsRef<Path>>(db_path: P) -> io::Result<()
         }
     }
 
-    let err = last_err.unwrap();
+    let err = last_err.unwrap_or_default();
     error!(
         "Failed to rename corrupt database file: {} to {}",
         db_path.display(),