diff --git a/ChangeLog b/ChangeLog
index e43917953..c1f79af17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+	-deleteEntriesWithIds:ids]): make sure the objects returned by
+	lookupName:... are not instances of NSException.
+
 2007-11-03  Ludovic Marcotte  <ludovic@inverse.ca>
 
 	* UI/Scheduler/UIxAppointmentEditor.m
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 4ff6d1e23..3ff95dae3 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -378,7 +378,8 @@ static NSString *defaultUserID = @"<default>";
       currentID = [ids objectAtIndex: count];
       deleteObject = [self lookupName: currentID
 			   inContext: context acquire: NO];
-      [deleteObject delete];
+      if (![deleteObject isKindOfClass: [NSException class]])
+	[deleteObject delete];
     }
 }