1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/rfc822/MCMessageParser.cpp b/src/core/rfc822/MCMessageParser.cpp
index e68d701b..14a939d7 100644
--- a/src/core/rfc822/MCMessageParser.cpp
+++ b/src/core/rfc822/MCMessageParser.cpp
@@ -22,6 +22,9 @@ MessageParser * MessageParser::messageParserWithData(Data * data)
 MessageParser * MessageParser::messageParserWithContentsOfFile(String * filename)
 {
     Data * data = Data::dataWithContentsOfFile(filename);
+    if (data == NULL) {
+        data = Data::data();
+    }
     return messageParserWithData(data);
 }