diff --git a/ChangeLog b/ChangeLog
index 8a7f28876..4cd358e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-09-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m
+	(-moveCopyMessagesWithMID:fromFolder:withMID:wantCopy:): ensure
+	that "data" is not NULL before passing it to
+	set_SPropValue_proptag as it might be converted to a PT_ERROR
+	value.
+
 	* SoObjects/Mailer/SOGoDraftObject.m (-sendMailAndCopyToSent:):
 	renamed "sendMail" and made copying the messsage to the sent
 	folder opetional.
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 7a4fd5b07..2b22d9a85 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -605,7 +605,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
           error = [sourceMsg getProperty: &data
                                  withTag: propTag
                                 inMemCtx: aRow];
-          if (error == MAPISTORE_SUCCESS)
+          if (error == MAPISTORE_SUCCESS && data)
             {
               set_SPropValue_proptag(&aRow->lpProps[aRow->cValues], propTag, data);
               aRow->cValues++;