diff --git a/keypair/src/key_pair.rs b/keypair/src/key_pair.rs
index 110bf03..cbd1509 100644
--- a/keypair/src/key_pair.rs
+++ b/keypair/src/key_pair.rs
@@ -187,7 +187,7 @@ impl From<libp2p_identity::Keypair> for KeyPair {
                     let raw_kp = ed25519::Keypair::decode(&mut kp.to_bytes())?;
                     Ok(KeyPair::Ed25519(raw_kp))
                 }
-                _ => unreachable!(),
+                _ => unimplemented!("key type not supported: {:?}", key.key_type()),
             }
         }
 
diff --git a/keypair/src/public_key.rs b/keypair/src/public_key.rs
index 9b2bb23..9ee27a2 100644
--- a/keypair/src/public_key.rs
+++ b/keypair/src/public_key.rs
@@ -103,7 +103,7 @@ impl From<libp2p_identity::PublicKey> for PublicKey {
                     let raw_pk = ed25519::PublicKey::decode(&pk.to_bytes())?;
                     Ok(PublicKey::Ed25519(raw_pk))
                 }
-                _ => unreachable!(),
+                _ => unimplemented!("key not supported: {:?}", key.key_type()),
             }
         }