Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java	(revision 6015)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java	(revision 6016)
@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
+
 import javax.swing.DefaultComboBoxModel;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -97,5 +98,8 @@
                 wmsUrl.setEnabled(!endpoint.isSelected());
                 if (endpoint.isSelected()) {
-                    name.setText(wms.getServiceUrl().getHost());
+                    URL url = wms.getServiceUrl();
+                    if (url != null) {
+                        name.setText(url.getHost());
+                    }
                 } else {
                     onLayerSelectionChanged();