diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
index b5c02b26d..bb9d14c94 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
@@ -280,7 +280,9 @@ public class ActionGraph extends Graph {
                 //GraphPart breakPart = breakParts.isEmpty() ? null : breakParts.get(0);
                 List<GraphPart> mcp = new ArrayList<>();
                 mcp.addAll(caseBodyParts);
-                mcp.add(defaultPart2);
+                if (defaultPart2 != null) {
+                    mcp.add(defaultPart2);
+                }
                 GraphPart breakPart = getMostCommonPart(mcp, loops);
                 if ((defaultPart2 != breakPart) && (defaultCommands.isEmpty())) {
                     defaultPart = defaultPart2;
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java
index 46194f4c9..bea671e98 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java
@@ -83,10 +83,10 @@ public class ClassTreeItem extends TreeItem implements Block {
             ret += "static " + f.toString(constants) + "\r\n";
         }
         for (KeyValue<GraphTargetItem, GraphTargetItem> item : vars) {
-            ret += "var " + item.key.toStringNoQuotes(constants) + " = " + item.value.toStringNoQuotes(constants) + ";\r\n";
+            ret += "var " + item.key.toStringNoQuotes(constants) + " = " + item.value.toString(constants) + ";\r\n";
         }
         for (KeyValue<GraphTargetItem, GraphTargetItem> item : staticVars) {
-            ret += "static var " + item.key.toStringNoQuotes(constants) + " = " + item.value.toStringNoQuotes(constants) + ";\r\n";
+            ret += "static var " + item.key.toStringNoQuotes(constants) + " = " + item.value.toString(constants) + ";\r\n";
         }
         ret += "}\r\n";
         return ret;