diff --git a/ChangeLog b/ChangeLog
index d15bec30a..c6309fcda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTable.m (-destroyHandle:): skih operation if
+	the handle parameter is 0.
+
 	* OpenChange/SOGoMAPIFSMessage.m (-delete): returns the exception
 	rather than raising it.
 
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 16b8febf6..620b8f248 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -351,7 +351,7 @@ static Class NSDataK, NSStringK;
 
 - (void) destroyHandle: (uint32_t) tableHandleId
 {
-  if (handleId == tableHandleId)
+  if (tableHandleId && (handleId == tableHandleId))
     [[MAPIStoreActiveTables activeTables] unregisterTable: self];
 }