1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/renderer/MCHTMLRenderer.cc b/src/core/renderer/MCHTMLRenderer.cc
index 8b561e71..8d0b4ecb 100644
--- a/src/core/renderer/MCHTMLRenderer.cc
+++ b/src/core/renderer/MCHTMLRenderer.cc
@@ -417,8 +417,13 @@ String * htmlForAbstractMultipartAlternative(AbstractMultipart * part, htmlRende
         }
     }
 
+    String * html = htmlForAbstractPart(preferredAlternative, context);
+    if (html == NULL) {
+        return NULL;
+    }
+    
     String * result = String::string();
-    result->appendString(htmlForAbstractPart(preferredAlternative, context));
+    result->appendString(html);
     if (calendar != NULL) {
         result->appendString(htmlForAbstractPart(calendar, context));
     }