diff --git a/ChangeLog b/ChangeLog
index adc55a73b..8d62d80a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m
+	(-getPidTagLocalCommitTimeMax:inMemCtx:): returns
+	MAPISTORE_ERR_NOT_FOUND if the resulting date is nil.
+
 	* OpenChange/MAPIStoreGCSMessage.m
 	(-getPidTagPredecessorChangeList:inMemCtx:): when the list is
 	missing, request a synchronisation from the container as the
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 4ce08728d..1fed249d2 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -1261,9 +1261,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (int) getPidTagLocalCommitTimeMax: (void **) data
                            inMemCtx: (TALLOC_CTX *) memCtx
 {
-  *data = [[self lastMessageModificationTime] asFileTimeInMemCtx: memCtx];
+  int rc = MAPISTORE_SUCCESS;
+  NSDate *date;
 
-  return MAPISTORE_SUCCESS;
+  date = [self lastMessageModificationTime];
+  if (date)
+    *data = [date asFileTimeInMemCtx: memCtx];
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
 }
 
 - (int) getProperty: (void **) data