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 19c774f43..248eaefa7 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
@@ -2371,7 +2371,9 @@ public class AVM2Code implements Cloneable {
             pos = code.size();
         }
         final int byteCount = instruction.getBytesLength();
-        if (pos == code.size()) {
+        if (code.size() == 0) {
+            instruction.setAddress(0);
+        } else if (pos == code.size()) {
             instruction.setAddress(code.get(pos - 1).getAddress() + code.get(pos - 1).getBytesLength());
         } else {
             instruction.setAddress(code.get(pos).getAddress());
diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
index 471aefe2c..8efd1cbec 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
@@ -533,7 +533,7 @@ public abstract class MainFrameMenu implements MenuBuilder {
 
     protected boolean reloadActionPerformed(ActionEvent evt) {
         if (swf != null) {
-            if (View.showConfirmDialog(null, translate("message.confirm.reload"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+            if (!Configuration.showCloseConfirmation.get() || View.showConfirmDialog(null, translate("message.confirm.reload"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
                 Main.reloadFile(swf.swfList);
             }
         }
@@ -542,7 +542,7 @@ public abstract class MainFrameMenu implements MenuBuilder {
 
     protected boolean reloadAllActionPerformed(ActionEvent evt) {
         if (swf != null) {
-            if (View.showConfirmDialog(null, translate("message.confirm.reloadAll"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+            if (!Configuration.showCloseConfirmation.get() || View.showConfirmDialog(null, translate("message.confirm.reloadAll"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
                 Main.reloadApp();
             }