diff --git a/ChangeLog b/ChangeLog
index 8be0f49e4..a7b09767a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-04  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Contacts/SOGoContactSourceFolder.m
+	(-lookupName:inContext:acquire:): verify the result of
+	lookupContactEntry as it will not necessarily return a contact.
+
 2010-04-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/sogo-tool.m (setupUserDefaults): new function that sets up
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index 5a7b85ed8..c33fff60c 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -1,6 +1,6 @@
 /* SOGoContactSourceFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2009 Inverse inc.
+ * Copyright (C) 2006-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -181,7 +181,8 @@
       if (!ldifEntry)
         {
           ldifEntry = [source lookupContactEntry: objectName];
-          [childRecords setObject: ldifEntry forKey: objectName];
+	  if (ldifEntry)
+	    [childRecords setObject: ldifEntry forKey: objectName];
         }
       if (ldifEntry)
         obj = [SOGoContactLDIFEntry contactEntryWithName: objectName