diff --git a/ChangeLog b/ChangeLog
index a1bba5dc7..c2bcf304f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromMAPISPropValue)
+	(NSObjectFromSPropValue): treat PT_ERROR just as PT_LONG.
+
 2012-03-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailFolder.m
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 980431d1b..56665d0fb 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -96,6 +96,7 @@ NSObjectFromMAPISPropValue (const struct mapi_SPropValue *value)
       result = [NSNumber numberWithUnsignedShort: value->value.i];
       break;
     case PT_LONG:
+    case PT_ERROR:
       result = [NSNumber numberWithUnsignedLong: value->value.l];
       break;
     case PT_I8:
@@ -175,6 +176,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
       result = [NSNumber numberWithShort: value->value.i];
       break;
     case PT_LONG:
+    case PT_ERROR:
       result = [NSNumber numberWithLong: value->value.l];
       break;
     case PT_I8: