Index: /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 10931)
+++ /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 10932)
@@ -307,5 +307,5 @@
             if (Main.map == null)
                 return;
-            if (oldMapMode != null ) {
+            if (oldMapMode != null) {
                 Main.map.selectMapMode(oldMapMode);
                 oldMapMode = null;
Index: /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 10931)
+++ /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 10932)
@@ -97,19 +97,19 @@
 
         text.append("Screen: ");
-        for (GraphicsDevice gd: GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
-            DisplayMode dm = gd.getDisplayMode();
-            if (dm != null) {
-                text.append(gd.getIDstring());
-                text.append(' ').
-                append(dm.getWidth()).
-                append('x').
-                append(dm.getHeight()).
-                append(", ");
+        if (!GraphicsEnvironment.isHeadless()) {
+            for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
+                DisplayMode dm = gd.getDisplayMode();
+                if (dm != null) {
+                    text.append(gd.getIDstring()).append(' ')
+                        .append(dm.getWidth()).append('x')
+                        .append(dm.getHeight())
+                        .append(", ");
+                }
             }
         }
         Dimension maxScreenSize = GuiHelper.getMaximumScreenSize();
-        text.append("\nMaximum Screen Size: ").
-        append((int)maxScreenSize.getWidth()).append('x').
-        append((int)maxScreenSize.getHeight()).append('\n');
+        text.append("\nMaximum Screen Size: ")
+            .append((int) maxScreenSize.getWidth()).append('x')
+            .append((int) maxScreenSize.getHeight()).append('\n');
 
         if (Main.platform.getClass() == PlatformHookUnixoid.class) {