diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.h b/SoObjects/Contacts/SOGoContactLDIFEntry.h
index 5a20a3735..2e4bfd6ef 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.h
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.h
@@ -27,6 +27,7 @@
 @class NSDictionary;
 @class NSString;
 @class NGVList;
+@class NSNull;
 
 @interface SOGoContactLDIFEntry : SOGoObject <SOGoContactObject>
 {
diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.m b/SoObjects/Contacts/SOGoContactLDIFEntry.m
index 322f30ebb..8d3714325 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.m
@@ -162,7 +162,7 @@
 
 - (BOOL) hasPhoto
 {
-  return ([ldifEntry objectForKey: @"photo"] != nil);
+  return ([ldifEntry objectForKey: @"photo"] != nil && [ldifEntry objectForKey: @"photo"] != [NSNull null]);
 }
 
 - (NSString *) davEntityTag