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 4abbf75bd..19c774f43 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
@@ -2187,10 +2187,12 @@ public class AVM2Code implements Cloneable {
             //Note: changing operands here does not change instruction byte length as offsets are always S24 (not variable length)
         }
 
-        for (ABCException ex : body.exceptions) {
-            ex.start = updater.updateOperandOffset(-1, ex.start, ex.start);
-            ex.end = updater.updateOperandOffset(-1, ex.end, ex.end);
-            ex.target = updater.updateOperandOffset(-1, ex.target, ex.target);
+        if (body != null) {
+            for (ABCException ex : body.exceptions) {
+                ex.start = updater.updateOperandOffset(-1, ex.start, ex.start);
+                ex.end = updater.updateOperandOffset(-1, ex.end, ex.end);
+                ex.target = updater.updateOperandOffset(-1, ex.target, ex.target);
+            }
         }
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
index f0144e696..ef20b3154 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
@@ -39,6 +39,7 @@ import com.jpexs.decompiler.flash.tags.base.ButtonTag;
 import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.DrawableTag;
+import com.jpexs.decompiler.flash.tags.base.ImageTag;
 import com.jpexs.decompiler.flash.tags.base.MorphShapeTag;
 import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag;
 import com.jpexs.decompiler.flash.tags.base.RemoveTag;
@@ -691,7 +692,12 @@ public class Timeline {
             img = new SerializableImage(newWidth, newHeight, SerializableImage.TYPE_INT_ARGB_PRE);
             img.fillTransparent();
 
-            drawable.toImage(dframe, time, ratio, renderContext, img, isClip || clipDepth > -1, m, strokeTransform, absMat, clrTrans);
+            if (!(drawable instanceof ImageTag)) {
+                // image tags are not rendered, they should be embedded in shape tags
+                drawable.toImage(dframe, time, ratio, renderContext, img, isClip || clipDepth > -1, m, strokeTransform, absMat, clrTrans);
+            } else {
+                // todo: show one time warning
+            }
 
             if (filters != null) {
                 for (FILTER filter : filters) {