diff --git a/src/core/file_history.rs b/src/core/file_history.rs
index fbc81d4..ceffdcc 100644
--- a/src/core/file_history.rs
+++ b/src/core/file_history.rs
@@ -44,15 +44,13 @@ pub fn resolve_rename_chain(
         let mut fwd_stmt = conn.prepare_cached(forward_sql)?;
         let forward: Vec<String> = fwd_stmt
             .query_map(rusqlite::params![project_id, &current], |row| row.get(0))?
-            .filter_map(std::result::Result::ok)
-            .collect();
+            .collect::<std::result::Result<Vec<_>, _>>()?;
 
         // Backward: current was the new name -> discover old names
         let mut bwd_stmt = conn.prepare_cached(backward_sql)?;
         let backward: Vec<String> = bwd_stmt
             .query_map(rusqlite::params![project_id, &current], |row| row.get(0))?
-            .filter_map(std::result::Result::ok)
-            .collect();
+            .collect::<std::result::Result<Vec<_>, _>>()?;
 
         for discovered in forward.into_iter().chain(backward) {
             if visited.insert(discovered.clone()) {
diff --git a/src/core/path_resolver.rs b/src/core/path_resolver.rs
index 761a674..201fac4 100644
--- a/src/core/path_resolver.rs
+++ b/src/core/path_resolver.rs
@@ -294,8 +294,7 @@ fn try_resolve_rename_ambiguity(
 
     let old_paths: Vec<String> = stmt
         .query_map(param_refs.as_slice(), |row| row.get(0))?
-        .filter_map(std::result::Result::ok)
-        .collect();
+        .collect::<std::result::Result<Vec<_>, _>>()?;
 
     // The newest path is a candidate that is NOT an old_path in any intra-chain rename.
     let newest = candidates.iter().find(|c| !old_paths.contains(c));