diff --git a/MacPass/MPDocument+Autotype.m b/MacPass/MPDocument+Autotype.m
index 5e236a31..30918e45 100644
--- a/MacPass/MPDocument+Autotype.m
+++ b/MacPass/MPDocument+Autotype.m
@@ -32,7 +32,7 @@
 
 + (BOOL)isCandidateForMalformedAutotype:(id)item {
   
-  NSString *keystrokeSequence;
+  NSString *keystrokeSequence = @"";
   if([item isKindOfClass:[KPKEntry class]] && ![((KPKEntry *)item).autotype hasDefaultKeystrokeSequence]) {
     keystrokeSequence = ((KPKEntry *)item).autotype.defaultKeystrokeSequence;
   }
diff --git a/MacPass/MPFixAutotypeWindowController.m b/MacPass/MPFixAutotypeWindowController.m
index 9710c327..b27f02b5 100644
--- a/MacPass/MPFixAutotypeWindowController.m
+++ b/MacPass/MPFixAutotypeWindowController.m
@@ -119,6 +119,10 @@ NSString *const kMPIconCell = @"IconCell";
     association = item;
   }
   
+  if(nil == entry || nil == group || nil == association) {
+    return nil;
+  }
+  
   if([[tableColumn identifier] isEqualToString:kMPTitleCell]) {
     if(entry) {
       return entry.title;