Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java	(revision 31646)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java	(revision 31665)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
@@ -90,5 +91,7 @@
         addStatusListener(this);
 
-        ConflictResolver.getInstance();
+        if (!GraphicsEnvironment.isHeadless()) {
+        	ConflictResolver.getInstance();
+        }
         SelectionMonitor.getInstance();
         Reasoner.getInstance();