diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m
index 506e0003d..918170d81 100644
--- a/Classes/ContactsTableViewController.m
+++ b/Classes/ContactsTableViewController.m
@@ -179,7 +179,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
     id data = [avatarMap objectForKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
     if(data == nil) {
         image = [FastAddressBook getContactImage:contact thumbnail:true];
-        [avatarMap setObject:image forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
+        if(image != nil) {
+            [avatarMap setObject:image forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
+        } else {
+            [avatarMap setObject:[NSNull null] forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
+        }
     } else if(data != [NSNull null]) {
         image = data;
     }
diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m
index ad45dd5f3..6db361946 100644
--- a/Classes/HistoryViewController.m
+++ b/Classes/HistoryViewController.m
@@ -48,7 +48,6 @@ typedef enum _HistoryView {
     [allButton release];
     [missedButton release];
     [editButton release];
-    
     [super dealloc];
 }