diff --git a/ChangeLog b/ChangeLog
index 613a3afc6..72ce783ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
+	-appendPersonalSources]): make sure the value of the "c_path4" of
+	the returned rows are not NSNull, otherwise, discard them.
+
 2007-09-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index 37604a352..224fffbaf 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -99,14 +99,15 @@
   row = [fc fetchAttributes: attrs withZone: NULL];
   while (row)
     {
-      folder
-	= [subFolderClass objectWithName: [row objectForKey: @"c_path4"]
-			  inContainer: self];
       key = [row objectForKey: @"c_path4"];
-      hasPersonal = (hasPersonal || [key isEqualToString: @"personal"]);
-      [folder setOCSPath: [NSString stringWithFormat: @"%@/%@",
-				    OCSPath, key]];
-      [subFolders setObject: folder forKey: key];
+      if ([key isKindOfClass: [NSString class]])
+	{
+	  folder = [subFolderClass objectWithName: key inContainer: self];
+	  hasPersonal = (hasPersonal || [key isEqualToString: @"personal"]);
+	  [folder setOCSPath: [NSString stringWithFormat: @"%@/%@",
+					OCSPath, key]];
+	  [subFolders setObject: folder forKey: key];
+	}
       row = [fc fetchAttributes: attrs withZone: NULL];
     }