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 cbbf6f34a..d1c582057 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -493,7 +493,9 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener {
 
     public void updateSearchPos() {
         searchPos.setText((foundPos + 1) + "/" + found.size());
-        decompiledTextArea.setScript(found.get(foundPos), list);
+        ScriptPack pack = found.get(foundPos);
+        setAbc(pack.abc);
+        decompiledTextArea.setScript(pack, list);
         hilightScript(found.get(foundPos));
         decompiledTextArea.setCaretPosition(0);
         SwingUtilities.invokeLater(new Runnable() {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java
index 3312216f5..f557d1ae8 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java
@@ -59,6 +59,9 @@ public class TraitsList extends JList<Object> implements ListSelectionListener {
 
     @SuppressWarnings("unchecked")
     public void setClassIndex(int classIndex, int scriptIndex) {
+        if(classIndex>=abc.instance_info.length){
+            return;
+        }
         this.classIndex = classIndex;
         if (classIndex == -1) {
             setModel(new DefaultListModel());