diff --git a/src/core/src/storage/mod.rs b/src/core/src/storage/mod.rs
index 6791b7219b..714fb63162 100644
--- a/src/core/src/storage/mod.rs
+++ b/src/core/src/storage/mod.rs
@@ -657,8 +657,11 @@ impl Storage for MemStorage {
     }
 
     fn load_sig(&self, path: &str) -> Result<SigStore> {
-        let x = self.sigs.read().unwrap(); // @CTB this is causing a problem
-        Ok(x.get(path).unwrap().clone())
+        let x = self.sigs.read().unwrap();
+        match x.get(path) {
+            Some(path) => Ok(path.clone()),
+            None => panic!("cannot get path")
+        }
     }
 
     fn save_sig(&self, path: &str, sig: Signature) -> Result<String> {