Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 11105)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 11106)
@@ -6,4 +6,5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
@@ -817,7 +818,9 @@
 
     protected void shutdown() {
-        worker.shutdown();
-        ImageProvider.shutdown(false);
-        JCSCacheManager.shutdown();
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdown();
+            ImageProvider.shutdown(false);
+            JCSCacheManager.shutdown();
+        }
         if (map != null) {
             map.rememberToggleDialogWidth();
@@ -830,6 +833,8 @@
             Main.warn(ex, tr("Failed to save default preferences."));
         }
-        worker.shutdownNow();
-        ImageProvider.shutdown(true);
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdownNow();
+            ImageProvider.shutdown(true);
+        }
     }