diff --git a/ChangeLog b/ChangeLog
index 7394d3700..8f361f562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue): set the
+	resulting string to @"" when the unicode or string pointers are
+	NULL.
+
 2011-11-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreContext.m
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index ac439bc90..ba8ed926a 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -188,10 +188,14 @@ NSObjectFromSPropValue (const struct SPropValue *value)
       result = [NSNumber numberWithDouble: value->value.dbl];
       break;
     case PT_UNICODE:
-      result = [NSString stringWithUTF8String: value->value.lpszW];
+      result = (value->value.lpszW
+                ? [NSString stringWithUTF8String: value->value.lpszW]
+                : @"");
       break;
     case PT_STRING8:
-      result = [NSString stringWithUTF8String: value->value.lpszA];
+      result = (value->value.lpszA
+                ? [NSString stringWithUTF8String: value->value.lpszA]
+                : @"");
       break;
     case PT_SYSTIME:
       result = [NSCalendarDate dateFromFileTime: &(value->value.ft)];