diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
index bb171d99f..7096854ee 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
@@ -299,7 +299,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -2268,7 +2267,7 @@ public class AVM2Code implements Cloneable {
             new AVM2DeobfuscatorSimple().deobfuscate(path, classIndex, isStatic, scriptIndex, abc, constants, trait, info, body);
             new AVM2DeobfuscatorRegisters().deobfuscate(path, classIndex, isStatic, scriptIndex, abc, constants, trait, info, body);
             new AVM2DeobfuscatorJumps().deobfuscate(path, classIndex, isStatic, scriptIndex, abc, constants, trait, info, body);
-            //body.getCode().checkValidOffsets(body); // todo: only for debugging. checkValidOffsets can be made private later            
+            //body.getCode().checkValidOffsets(body); // todo: only for debugging. checkValidOffsets can be made private later
             return 1;
         }
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
index 1ebaa7d72..7181adccb 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
@@ -161,6 +161,10 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
     }
 
     public GraphTextWriter toStringSemicoloned(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+        if (Thread.currentThread().isInterrupted()) {
+            throw new InterruptedException();
+        }
+
         writer.startOffset(src, getPos(), srcData);
         appendTo(writer, localData);
         if (needsSemicolon()) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
index 19062f7eb..01e9c2f09 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
@@ -32,9 +32,9 @@ public class Loop implements Serializable {
 
     public GraphPart loopPreContinue;
 
-    public List<GraphPart> breakCandidates = new ArrayList<>();
+    public final List<GraphPart> breakCandidates = new ArrayList<>();
 
-    public List<Integer> breakCandidatesLevels = new ArrayList<>();
+    public final List<Integer> breakCandidatesLevels = new ArrayList<>();
 
     public long id;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/LoopItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/LoopItem.java
index 3f2636e25..996476a4b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/LoopItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/LoopItem.java
@@ -1,18 +1,19 @@
 /*
  *  Copyright (C) 2010-2015 JPEXS, All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
 */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.graph.GraphSourceItem;
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 7148241be..05670831c 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -1295,10 +1295,10 @@ public class CommandLineArgumentParser {
                         scriptExportSettings.singleFileWriter = writer;
                         if (!as3classes.isEmpty()) {
                             for (String as3class : as3classes) {
-                                exportOK = exportOK && swf.exportAS3Class(as3class, scriptsFolder, scriptExportSettings, parallel, evl);
+                                exportOK = swf.exportAS3Class(as3class, scriptsFolder, scriptExportSettings, parallel, evl) && exportOK;
                             }
                         } else {
-                            exportOK = exportOK && swf.exportActionScript(handler, scriptsFolder, scriptExportSettings, parallel, evl) != null;
+                            exportOK = swf.exportActionScript(handler, scriptsFolder, scriptExportSettings, parallel, evl) != null && exportOK;
                         }
                     }
                 }