diff --git a/ChangeLog b/ChangeLog
index e0f8e7f48..0369886d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder
+	-appendObject:objectwithBaseURL:baseURLtoREPORTResponse:r]): don't
+	lookup the returned object if its c_name has no length.
+
 2009-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index 21a69bc4a..c7a406541 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -57,29 +57,32 @@
   NSString *name, *etagLine, *contactString;
 
   name = [object objectForKey: @"c_name"];
-  component = [self lookupName: name inContext: context acquire: NO];
+  if ([name length])
+    {
+      component = [self lookupName: name inContext: context acquire: NO];
 
-  [r appendContentString: @"  <D:response>\r\n"];
-  [r appendContentString: @"    <D:href>"];
-  [r appendContentString: baseURL];
-  if (![baseURL hasSuffix: @"/"])
-    [r appendContentString: @"/"];
-  [r appendContentString: name];
-  [r appendContentString: @"</D:href>\r\n"];
+      [r appendContentString: @"  <D:response>\r\n"];
+      [r appendContentString: @"    <D:href>"];
+      [r appendContentString: baseURL];
+      if (![baseURL hasSuffix: @"/"])
+	[r appendContentString: @"/"];
+      [r appendContentString: name];
+      [r appendContentString: @"</D:href>\r\n"];
 
-  [r appendContentString: @"    <D:propstat>\r\n"];
-  [r appendContentString: @"      <D:prop>\r\n"];
-  etagLine = [NSString stringWithFormat: @"        <D:getetag>%@</D:getetag>\r\n",
-                       [component davEntityTag]];
-  [r appendContentString: etagLine];
-  [r appendContentString: @"      </D:prop>\r\n"];
-  [r appendContentString: @"      <D:status>HTTP/1.1 200 OK</D:status>\r\n"];
-  [r appendContentString: @"    </D:propstat>\r\n"];
-  [r appendContentString: @"    <C:addressbook-data>"];
-  contactString = [[component contentAsString] stringByEscapingXMLString];
-  [r appendContentString: contactString];
-  [r appendContentString: @"</C:addressbook-data>\r\n"];
-  [r appendContentString: @"  </D:response>\r\n"];
+      [r appendContentString: @"    <D:propstat>\r\n"];
+      [r appendContentString: @"      <D:prop>\r\n"];
+      etagLine = [NSString stringWithFormat: @"        <D:getetag>%@</D:getetag>\r\n",
+			   [component davEntityTag]];
+      [r appendContentString: etagLine];
+      [r appendContentString: @"      </D:prop>\r\n"];
+      [r appendContentString: @"      <D:status>HTTP/1.1 200 OK</D:status>\r\n"];
+      [r appendContentString: @"    </D:propstat>\r\n"];
+      [r appendContentString: @"    <C:addressbook-data>"];
+      contactString = [[component contentAsString] stringByEscapingXMLString];
+      [r appendContentString: contactString];
+      [r appendContentString: @"</C:addressbook-data>\r\n"];
+      [r appendContentString: @"  </D:response>\r\n"];
+    }
 }
 
 + (id) folderWithName: (NSString *) aName