diff --git a/tuf/repo/keystore.py b/tuf/repo/keystore.py
index 6791860d..4346ee38 100755
--- a/tuf/repo/keystore.py
+++ b/tuf/repo/keystore.py
@@ -208,7 +208,8 @@ def load_keystore_from_keyfiles(directory_name, keyids, passwords):
     for password in passwords:
       try:
         json_data = _decrypt(raw_contents, password)
-      except tuf.CryptoError:
+      except:
+        logger.warn(repr(full_filepath)+' contains an invalid key.')
         continue
      
       try: