diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
index 88ccf04ec..dd5108c14 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -1440,7 +1440,7 @@ public class SWFInputStream implements AutoCloseable {
 
             boolean doParse = true;
 
-            if (((parseTags && !parallel1 && doParse) || (tag.getId() == ExporterInfo.ID)) && (tag instanceof TagStub)) {
+            if (((parseTags && !parallel1 && doParse) || (tag != null && tag.getId() == ExporterInfo.ID)) && (tag instanceof TagStub)) {
                 tag = resolveTag((TagStub) tag, level, parallel, skipUnusualTags, lazy, true);
             }
             if (tag instanceof ExporterInfo) {
diff --git a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java
index f934b2dd4..2e281d03e 100644
--- a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java
+++ b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java
@@ -146,6 +146,9 @@ public class DumpTree extends JTree {
                         nodeType = TreeNodeType.FLASH;
                     } else if ("TAG".equals(di.type)) {
                         String name = di.name;
+                        if (name == null) {
+                            name = "null";
+                        }
                         if (name.contains(" ")) {
                             name = name.substring(0, name.indexOf(' ')).trim();
                         }