diff --git a/ChangeLog b/ChangeLog
index 171a82f9e..5169befd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreSOGo.m (sogo_folder_move_folder): if
+	"target_folder_object", we do not attempt to access the
+	corresponding instance member.
+
 	* OpenChange/MAPIStoreMailFolder.m (-
 	moveCopyMessagesWithMIDs:andCount:fromFolder:withMIDs:andChangeKeys:wantCopy:):
 	do not attempt to access targetChangeKeys when NULL, to avoid a
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 276bd6268..38bdd765a 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -626,7 +626,10 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object,
       moveFolder = wrapper->instance;
 
       wrapper = target_folder_object;
-      targetFolder = wrapper->instance;
+      if (wrapper)
+        targetFolder = wrapper->instance;
+      else
+        targetFolder = nil;
 
       GSRegisterCurrentThread ();
       pool = [NSAutoreleasePool new];