diff --git a/ChangeLog b/ChangeLog
index f10711b10..b04463fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* OpenChange/MAPIStoreSOGo.m (sogo_folder_move_folder)
 	(sogo_folder_copy_folder): new backend methods.
+	(sogo_folder_move_folder): do not instantiate an NSString from a
+	NULL "new_folder_name" parameter.
 
 2012-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 09dfa596a..aaac2bcf7 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -631,7 +631,10 @@ sogo_folder_move_folder(void *folder_object, void *source_folder_object,
       GSRegisterCurrentThread ();
       pool = [NSAutoreleasePool new];
 
-      newFolderName = [NSString stringWithUTF8String: new_folder_name];
+      if (new_folder_name)
+        newFolderName = [NSString stringWithUTF8String: new_folder_name];
+      else
+        newFolderName = nil;
 
       rc = [targetFolder moveFolderWithFID: fid
                                 fromFolder: sourceFolder