diff --git a/KeePassKit b/KeePassKit
index ed0a78d0..65f7098e 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit ed0a78d09ed4601d40dc0d245a0cdd70ddcdb375
+Subproject commit 65f7098eaf220c64fc728b2212bb7119e807e97a
diff --git a/MacPass/NSError+Messages.m b/MacPass/NSError+Messages.m
index d0920827..773763d6 100644
--- a/MacPass/NSError+Messages.m
+++ b/MacPass/NSError+Messages.m
@@ -12,37 +12,6 @@
 @implementation NSError (Messages)
 
 - (NSString *)descriptionForErrorCode {
-  switch ([self code]) {
-    case KPKErrorUnknownFileFormat:
-    case KPKErrorUnsupportedDatabaseVersion:
-    case KPKErrorNoData:
-    case KPKErrorHeaderCorrupted:
-    case KPKErrorWriteFailed:
-    case KPKErrorEncryptionFaild:
-    case KPKErrorDecryptionFaild:
-    case KPKErrorDatabaseParsingFailed:
-    case KPKerrorXMLKeyUnsupportedVersion:
-    case KPKErrorXMLKeyKeyElementMissing:
-    case KPKErrorXMLKeyDataElementMissing:
-    case KPKErrorXMLKeyDataParsingError:
-    case KPKErrorUnsupportedCipher:
-    case KPKErrorUnsupportedCompressionAlgorithm:
-    case KPKErrorUnsupportedRandomStream:
-    case KPKErrorPasswordAndOrKeyfileWrong:
-    case KPKErrorIntegrityCheckFaild:
-    case KPKErrorXMLKeePassFileElementMissing:
-    case KPKErrorXMLRootElementMissing:
-    case KPKErrorXMLMetaElementMissing:
-    case KPKErrorXMLGroupElementMissing:
-    case KPKErrorXMLInvalidHeaderFieldSize:
-    case KPKErrorXMLInvalidHeaderFieldType:
-    case KPKErrorLegacyInvalidFieldType:
-    case KPKErrorLegacyInvalidFieldSize:
-    case KPKErrorLegacyHeaderHashCorrupted:
-    case KPKErrorLegacyCorruptTree:
-    default: {
-      return [NSString stringWithFormat:@"%@ (%ld)", [self localizedDescription], [self code] ];
-    }
-  }
+  return [NSString stringWithFormat:@"%@ (%ld)", [self localizedDescription], [self code] ];
 }
 @end