Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 18625)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 18670)
@@ -10,4 +10,5 @@
 import java.awt.event.MouseMotionListener;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.DefaultComboBoxModel;
@@ -30,7 +31,7 @@
 
 
-public class WMSAdjustAction extends MapMode implements
-    MouseListener, MouseMotionListener{
-
+public class WMSAdjustAction extends MapMode implements MouseListener, MouseMotionListener{
+	static private final Logger logger = Logger.getLogger(WMSAdjustAction.class.getName());
+	
     GeorefImage selectedImage;
     boolean mouseDown;
@@ -212,6 +213,4 @@
    }
 
-
-
 	@Override
 	protected void updateEnabledState() {
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 18625)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 18670)
@@ -91,5 +91,5 @@
 
 		executor = Executors.newFixedThreadPool(3);
-		if (!baseURL.startsWith("html:") && !WMSGrabber.isUrlWithPatterns(baseURL)) {
+		if (baseURL != null && !baseURL.startsWith("html:") && !WMSGrabber.isUrlWithPatterns(baseURL)) {
 			if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
 				if (!confirmMalformedUrl(baseURL)) {