diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
index 8ef1cf532..d00577fba 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
@@ -156,7 +156,9 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
         finalizePath();
         thickness *= zoom / SWF.unitDivisor;
         path.setAttribute("fill", "none");
-        path.setAttribute("stroke", color.toHexRGB());
+        if (color != null) {
+            path.setAttribute("stroke", color.toHexRGB());
+        }
         path.setAttribute("stroke-width", Double.toString(thickness == 0 ? 1 : thickness));
         if (color instanceof RGBA) {
             RGBA colorA = (RGBA) color;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/SWFList.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/SWFList.java
index 4a540a307..f486ea0f8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/SWFList.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/SWFList.java
@@ -44,7 +44,11 @@ public class SWFList implements List<SWF>, SWFContainerItem {
 
     @Override
     public String toString() {
-        return name;
+        if (isBundle) {
+            return name;
+        } else {
+            return swfs.get(0).getFileTitle();
+        }
     }
 
     @Override
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 83d8dc7de..c66bce3b4 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -695,7 +695,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
         }
         
         if (modified) {
-            if (View.showConfirmDialog(this, translate("message.confirm.close").replace("{swfName}",swfList.name), translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.CANCEL_OPTION) == JOptionPane.CANCEL_OPTION) {
+            if (View.showConfirmDialog(this, translate("message.confirm.close").replace("{swfName}", swfList.toString()), translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.OK_OPTION) == JOptionPane.CANCEL_OPTION) {
                 return;
             }
         }