diff --git a/crates/cairo-lang-semantic/src/expr/compute.rs b/crates/cairo-lang-semantic/src/expr/compute.rs
index 19f618c1386..b8b9c59a408 100644
--- a/crates/cairo-lang-semantic/src/expr/compute.rs
+++ b/crates/cairo-lang-semantic/src/expr/compute.rs
@@ -4814,7 +4814,7 @@ fn match_method_to_traits<'db>(
         .filter_map(|(trait_id, path)| {
             let mut data = InferenceData::new(InferenceId::NoContext);
             let mut inference = data.inference(db);
-            let trait_function = db.trait_function_by_name(*trait_id, method_name).ok()??;
+            let trait_function = db.trait_function_by_name(*trait_id, method_name).ok().flatten()?;
             let (concrete_trait_id, _) = inference.infer_concrete_trait_by_self_without_errors(
                 trait_function,
                 ty,
diff --git a/crates/cairo-lang-semantic/src/resolve/mod.rs b/crates/cairo-lang-semantic/src/resolve/mod.rs
index 46ba533c298..bf927c33967 100644
--- a/crates/cairo-lang-semantic/src/resolve/mod.rs
+++ b/crates/cairo-lang-semantic/src/resolve/mod.rs
@@ -1828,7 +1828,7 @@ impl<'db, 'a> Resolution<'db, 'a> {
                 resolved_items.mark_concrete(db, segment, ResolvedConcreteItem::Module(module_id));
             })
         {
-            return Ok(ResolvedConcreteItem::Module(base_module?));
+            return base_module.map(ResolvedConcreteItem::Module);
         }
 
         let db = self.resolver.db;
@@ -1970,7 +1970,7 @@ impl<'db, 'a> Resolution<'db, 'a> {
                 resolved_items.mark_generic(db, segment, ResolvedGenericItem::Module(module_id));
             })
         {
-            return Ok(ResolvedGenericItem::Module(base_module?));
+            return base_module.map(ResolvedGenericItem::Module);
         }
         let db = self.resolver.db;
         Ok(match self.segments.peek().unwrap() {
diff --git a/crates/cairo-lang-test-plugin/src/lib.rs b/crates/cairo-lang-test-plugin/src/lib.rs
index e06f9e0a26d..9ba32715306 100644
--- a/crates/cairo-lang-test-plugin/src/lib.rs
+++ b/crates/cairo-lang-test-plugin/src/lib.rs
@@ -264,7 +264,7 @@ fn find_all_tests<'db>(
                 else {
                     return None;
                 };
-                Some((*func_id, try_extract_test_config(db, attrs).ok()??))
+                Some((*func_id, try_extract_test_config(db, attrs).ok().flatten()?))
             }));
         }
     }