diff --git a/cargo-geiger/src/mapping/geiger.rs b/cargo-geiger/src/mapping/geiger.rs
index 85b760d3..12d16e76 100644
--- a/cargo-geiger/src/mapping/geiger.rs
+++ b/cargo-geiger/src/mapping/geiger.rs
@@ -50,9 +50,7 @@ fn handle_source_repr(source_repr: &str) -> cargo_geiger_serde::Source {
                 rev: String::from(revision),
             }
         }
-        _ => {
-            panic!("Unrecognised source type: {}", source_type)
-        }
+        _ => panic!("Unrecognised source type: {}", source_type),
     }
 }
 
diff --git a/cargo-geiger/src/mapping/metadata.rs b/cargo-geiger/src/mapping/metadata.rs
index 6ef242de..0a36caab 100644
--- a/cargo-geiger/src/mapping/metadata.rs
+++ b/cargo-geiger/src/mapping/metadata.rs
@@ -59,7 +59,8 @@ impl MatchesIgnoringSource for cargo_metadata::Dependency {
         self.name
             == krates
                 .get_package_name_from_cargo_metadata_package_id(&package_id)
-                .unwrap()
+                .unwrap_or(package_id.to_string())
+                //.unwrap()
             && self.req.matches(
                 &krates
                     .get_package_version_from_cargo_metadata_package_id(