diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 3f2bc93e1..eccc5f207 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -2145,11 +2145,15 @@ public final class SWF implements SWFContainerItem, Timelined {
     }
     
     public static void uncache(ASMSource src) {
-        src.getSwf().as2Cache.remove(src);
+        if (src != null) {
+            src.getSwf().as2Cache.remove(src);
+        }
     }
 
     public static void uncache(ScriptPack pack) {
-        pack.getSwf().as3Cache.remove(pack);
+        if (pack != null) {
+            pack.getSwf().as3Cache.remove(pack);
+        }
     }
 
     public static boolean isCached(ASMSource src) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptParser.java
index ad3f0ae53..8c91d2ce8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptParser.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptParser.java
@@ -2303,7 +2303,6 @@ public class ActionScriptParser {
 
     public void addScriptFromTree(List<GraphTargetItem> items, boolean documentClass, int classPos) throws AVM2ParseException, CompilationException {
         AVM2SourceGenerator gen = new AVM2SourceGenerator(abc, otherABCs);
-        List<AVM2Instruction> ret = new ArrayList<>();
         SourceGeneratorLocalData localData = new SourceGeneratorLocalData(
                 new HashMap<String, Integer>(), 0, Boolean.FALSE, 0);
         localData.documentClass = documentClass;
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java
index 3a5ec71b4..95c1995f2 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java
@@ -103,7 +103,7 @@ public class RecompileTest {
                         System.out.println("Recompiling:" + en.getKey().toString() + "...");
                         en.getValue().toSource(htw, swf.abcList, abc.script_info.get(s).traits.traits, ScriptExportMode.AS, false);
                         String original = htw.toString();
-                        ABC nabc = new ABC(swf);
+                        ABC nabc = abc; //new ABC(swf);
                         com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScriptParser.compile(original, nabc, allAbcs, false, en.getKey().className + ".as", abc.instance_info.size());
                     }
                 }