diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py
index 2e11335..2b67586 100644
--- a/komrade/backend/keymaker.py
+++ b/komrade/backend/keymaker.py
@@ -522,7 +522,8 @@ class Keymaker(Logger):
         # return in dict form
         keys_saved_d = {}
         for key_saved in keys_saved:
-            keys_saved_d[key_saved] = keychain[key_saved]
+            if key_saved in keychain:
+                keys_saved_d[key_saved] = keychain[key_saved]
         return keys_saved_d