diff --git a/ChangeLog b/ChangeLog
index 9c01bf69e..0a0878069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-17  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m
+	Safety check in case no objectClass attribute is returned
+	from the LDAP server
+	* Updated NEWS file
+
 2009-08-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/AdministrationUI/UIxAdministration.m: new administration
diff --git a/NEWS b/NEWS
index 648bc0ad2..371d0b586 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.0-2009xxxx (1.0.5)
+--------------------
+- added backup/restore tools for all user's data (calendars, address books, preferences, etc.)
+- added Web administrative interface (right now, only for ACLs)
+
 1.0-20090812 (1.0.4)
 --------------------
 - added ability to create and modify event categories in the preferences
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 9619e8743..47bf15e63 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -661,8 +661,10 @@ static NSLock *lock;
 
   contactEntry = [NSMutableDictionary dictionary];
   [contactEntry setObject: [ldapEntry dn] forKey: @"dn"];
-  [contactEntry setObject: [ldapEntry objectClasses]
-                   forKey: @"objectClasses"];
+
+  if ([ldapEntry objectClasses])
+    [contactEntry setObject: [ldapEntry objectClasses]
+                     forKey: @"objectClasses"];
   attributes = [[self _searchAttributes] objectEnumerator];
   while ((currentAttribute = [attributes nextObject]))
     {