Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 18569)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 18570)
@@ -515,5 +515,6 @@
      */
     public static boolean exitJosm(boolean exit, int exitCode, SaveLayersDialog.Reason reason) {
-        final boolean proceed = Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
+        final boolean proceed = layerManager.getLayers().isEmpty() ||
+                Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
                 SaveLayersDialog.saveUnsavedModifications(layerManager.getLayers(),
                         reason != null ? reason : SaveLayersDialog.Reason.EXIT)));