1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/abstract/MCAddress.cpp b/src/core/abstract/MCAddress.cpp
index 335bc68b..505b064e 100644
--- a/src/core/abstract/MCAddress.cpp
+++ b/src/core/abstract/MCAddress.cpp
@@ -175,7 +175,11 @@ Array * Address::addressesWithRFC822String(String * string)
     struct mailimf_address_list * addr_list;
     Array * result;
     int r;
-    
+
+    if (string == NULL) {
+        return NULL;
+    }
+
     utf8String = string->UTF8Characters();
     currentIndex = 0;