diff --git a/ChangeLog b/ChangeLog
index 61653a6cf..e573fb3fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
+	-appendSystemSources]): modified the return type and returns nil,
+	to match the new SOGoParentFolder definition of the method.
+	Otherwise, a confusion is created on the stack.
+
 2009-03-23  Ludovic Marcotte <lmarcotte@inverse.ca>
 
         * SoObjects/SOGo/SOGoUser.m:
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index b83e7bd7d..c2330347f 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -50,7 +50,7 @@
   return [SOGoContactGCSFolder class];
 }
 
-- (void) appendSystemSources
+- (NSException *) appendSystemSources
 {
   LDAPUserManager *um;
   NSEnumerator *sourceIDs;
@@ -68,6 +68,8 @@
       [currentFolder setLDAPSource: [um sourceWithID: currentSourceID]];
       [subFolders setObject: currentFolder forKey: currentSourceID];
     }
+
+  return nil;
 }
 
 - (NSString *) defaultFolderName