diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index d5b5ed8c2..d1be8dccd 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -418,7 +418,7 @@ convention:
     [self setCategories: [o componentsSeparatedByString: @","]];
 
   // Photo
-  if ([ldifRecord objectForKey: @"photo"])
+  if ([ldifRecord objectForKey: @"photo"] && [ldifRecord objectForKey: @"photo"] != [NSNull null])
     [self setPhoto: [[ldifRecord objectForKey: @"photo"] stringByEncodingBase64]];
 
   [self cleanupEmptyChildren];
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 9ff8db637..58a958de8 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -739,7 +739,8 @@ static NSArray *childRecordFields = nil;
         qualifier = aclQualifier;
 
       // For Thunderbird, disable contact list
-      if ([[context request] isThunderbird]) {
+      // This will be removed when VCARD will be implemented
+      if ([[context request] isThunderbird] && [self isKindOfClass: NSClassFromString(@"SOGoContactGCSFolder")]) {
         vlistExclusionQualifier = [EOQualifier qualifierWithQualifierFormat: @"c_component != 'vlist'"];
         qualifier = [[[EOAndQualifier alloc] initWithQualifiers:
                                                     vlistExclusionQualifier,
@@ -1191,7 +1192,8 @@ static NSArray *childRecordFields = nil;
   folder = [self ocsFolder];
 
   // For Thunderbird, disable contact list
-  if ([[context request] isThunderbird]) {
+  // This will be removed when VCARD will be implemented
+  if ([[context request] isThunderbird] && [self isKindOfClass: NSClassFromString(@"SOGoContactGCSFolder")]) {
     vlistExclusionQualifier = [EOQualifier qualifierWithQualifierFormat: @"c_component != 'vlist'"];
     qualifier = [[[EOAndQualifier alloc] initWithQualifiers:
                                                 vlistExclusionQualifier,