diff --git a/classes/parser/parser.cpp b/classes/parser/parser.cpp
index 437ffe0..4da8db4 100644
--- a/classes/parser/parser.cpp
+++ b/classes/parser/parser.cpp
@@ -165,19 +165,22 @@ QString Parser::parseImagesTable(const QString &templateString,
 
         ParsedImageData *data = images->value(key);
 
-        QString charCode = this->hexCode(key, encoding, useBom);
+        if (data != NULL)
+        {
+            QString charCode = this->hexCode(key, encoding, useBom);
 
-        tags.importValues(data->tags());
-        tags.setTagValue(Tags::OutputCharacterCode, charCode);
-        if (it.hasNext())
-            tags.setTagValue(Tags::OutputComma, ",");
-        else
-            tags.setTagValue(Tags::OutputComma, "");
+            tags.importValues(data->tags());
+            tags.setTagValue(Tags::OutputCharacterCode, charCode);
+            if (it.hasNext())
+                tags.setTagValue(Tags::OutputComma, ",");
+            else
+                tags.setTagValue(Tags::OutputComma, "");
 
-        tags.setTagValue(Tags::OutputCharacterText, FontHelper::escapeControlChars(key));
+            tags.setTagValue(Tags::OutputCharacterText, FontHelper::escapeControlChars(key));
 
-        QString imageString = this->parse(templateString, tags, doc, images);
-        result.append(imageString);
+            QString imageString = this->parse(templateString, tags, doc, images);
+            result.append(imageString);
+        }
     }
 
     return result;