diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
index 42324f2ee..741a0524d 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
@@ -181,7 +181,7 @@ public class TagTree extends JTree {
                 boolean hasFocus) {
 
             TreeItem val = (TreeItem) value;
-            if (!(val instanceof SWFList) && val.getSwf() == null) {
+            if (val != null && !(val instanceof SWFList) && val.getSwf() == null) {
                 // SWF was closed
                 value = null;
             }
@@ -190,6 +190,11 @@ public class TagTree extends JTree {
                     tree, value, sel,
                     expanded, leaf, row,
                     hasFocus);
+
+            if (val == null) {
+                return this;
+            }
+
             TreeNodeType type = getTreeNodeType(val);
 
             if (type == TreeNodeType.FOLDER && expanded) {