diff --git a/core/src/key_manager.rs b/core/src/key_manager.rs
index 549adaa..c5982c8 100644
--- a/core/src/key_manager.rs
+++ b/core/src/key_manager.rs
@@ -31,7 +31,7 @@ use super::{
   getters(style = "ref", vis_all = "pub"),
   setters(skip)
 )]
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct KeyResponse<I> {
   /// Map of node id to response message
   messages: HashMap<I, SmolStr>,
@@ -227,7 +227,7 @@ where
       resp.num_resp += 1;
 
       // Decode the response
-      if !r.payload.is_empty() || r.payload[0] != MessageType::KeyResponse as u8 {
+      if r.payload.is_empty() || r.payload[0] != MessageType::KeyResponse as u8 {
         resp.messages.insert(
           r.from.id().cheap_clone(),
           SmolStr::new(format!(
diff --git a/core/src/serf/base/tests/serf.rs b/core/src/serf/base/tests/serf.rs
index b0ba9f9..73ef40b 100644
--- a/core/src/serf/base/tests/serf.rs
+++ b/core/src/serf/base/tests/serf.rs
@@ -857,6 +857,7 @@ pub async fn serf_write_keyring_file<T>(
 
   let resp = manager.list_keys().await.unwrap();
   assert_eq!(resp.primary_keys().len(), 1);
+  assert_eq!(resp.keys().len(), 1);
 }
 
 #[test]