diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index f46f0eaf6..cbbf6f34a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -439,6 +439,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener {
         switchAbc(listIndex);
         decompiledTextArea.clearScriptCache();
         decompiledTextArea.reloadClass();
+        detailPanel.methodTraitPanel.methodCodePanel.setBodyIndex(-1, abc);
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
index b2f357ec7..bbf591559 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
@@ -1,16 +1,16 @@
 /*
  *  Copyright (C) 2010-2013 JPEXS
- * 
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- * 
+ *
  *  This program 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 General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -103,6 +103,9 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
         this.bodyIndex = bodyIndex;
         this.abc = abc;
         this.name = name;
+        if (bodyIndex == -1) {
+            return;
+        }
         String textWithHexTags = abc.bodies[bodyIndex].code.toASMSource(abc.constants, abc.bodies[bodyIndex], true);
         textWithHex = Helper.hexToComments(textWithHexTags);
         textNoHex = Helper.stripComments(textWithHexTags);