1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc
index 384bb4e5..cd87009e 100644
--- a/src/core/rfc822/MCMessageBuilder.cc
+++ b/src/core/rfc822/MCMessageBuilder.cc
@@ -580,6 +580,9 @@ Array * MessageBuilder::attachments()
 
 void MessageBuilder::addAttachment(Attachment * attachment)
 {
+    if (attachment == NULL) {
+        return;
+    }
     if (mAttachments == NULL) {
         mAttachments = new Array();
     }
@@ -598,6 +601,9 @@ Array * MessageBuilder::relatedAttachments()
 
 void MessageBuilder::addRelatedAttachment(Attachment * attachment)
 {
+    if (attachment == NULL) {
+        return;
+    }
     if (mRelatedAttachments == NULL) {
         mRelatedAttachments = new Array();
     }