1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/basetypes/MCString.cpp b/src/core/basetypes/MCString.cpp
index 65c8f7a3..98e27f64 100644
--- a/src/core/basetypes/MCString.cpp
+++ b/src/core/basetypes/MCString.cpp
@@ -1161,6 +1161,10 @@ String * String::stringByDecodingMIMEHeaderValue(const char * phrase)
         MCLog("could not decode: %s\n", phrase);
     }
 
+    if (result == NULL) {
+      result = string();
+    }
+
     free(decoded);
     
     return result;