diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..e208587
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @aiblockofficial/core
\ No newline at end of file
diff --git a/src/tests/interfaces.rs b/src/tests/interfaces.rs
index 0db1bd3..1477a49 100644
--- a/src/tests/interfaces.rs
+++ b/src/tests/interfaces.rs
@@ -44,7 +44,11 @@ impl KvStoreConnection for DbStub {
             return Ok(None);
         }
 
-        let data = self.data.clone().unwrap();
+        let data = match self.data.clone() {
+            Some(d) => d,
+            None => return Ok(None),
+        
+        };
 
         match get_de_data::<T>(data) {
             Ok(d) => Ok(Some(d)),