diff --git a/ChangeLog b/ChangeLog
index afff66d78..558a959d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
+	-pathArrayToSOGoObject]): do not reorder the paths if the third
+	element is an instance of NSNull.
+
 	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
 	-subFolders]): returns a sorted array using the "compare:"
 	selector.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 31a6b6ce6..abb9acb1f 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -492,13 +492,16 @@ static BOOL kontactGroupDAV = YES;
   if ([realPathArray count] > 2)
     {
       objectName = [realPathArray objectAtIndex: 2];
-      objectDescription = [objectName componentsSeparatedByString: @"_"];
-      if ([objectDescription count] > 1)
+      if ([objectName isKindOfClass: [NSString class]])
 	{
-	  [realPathArray replaceObjectAtIndex: 0
-			 withObject: [objectDescription objectAtIndex: 0]];
-	  [realPathArray replaceObjectAtIndex: 2
-			 withObject: [objectDescription objectAtIndex: 1]];
+	  objectDescription = [objectName componentsSeparatedByString: @"_"];
+	  if ([objectDescription count] > 1)
+	    {
+	      [realPathArray replaceObjectAtIndex: 0
+			     withObject: [objectDescription objectAtIndex: 0]];
+	      [realPathArray replaceObjectAtIndex: 2
+			     withObject: [objectDescription objectAtIndex: 1]];
+	    }
 	}
     }