diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 6140eb141..58cab6105 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -855,8 +855,11 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
       synced = [self synchroniseCacheForUID: messageUid];
       if (synced)
         messageEntry = [[[versionsMessage properties] objectForKey: @"Messages"] objectForKey: messageUid];
-      else
-        abort ();
+      if (!messageEntry)
+        {
+          [self errorWithFormat: @"still nothing. We crash!"];
+          abort ();
+        }
     }
   [self _setChangeKey: changeKey forMessageEntry: messageEntry];