Index: /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 11634)
+++ /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 11635)
@@ -67,8 +67,5 @@
         putValue("toolbar", "imagery_" + info.getToolbarName());
         putValue("help", ht("/Preferences/Imagery"));
-        String tooltip = info.getToolTipText();
-        if (tooltip != null) {
-            setTooltip(tooltip.replaceAll("</?html>", ""));
-        }
+        setTooltip(info.getToolTipText().replaceAll("</?html>", ""));
         this.info = info;
         installAdapters();
Index: /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 11634)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 11635)
@@ -35,5 +35,5 @@
     @Test
     public void testEnabledState() {
-        assertTrue(new AddImageryLayerAction(new ImageryInfo()).isEnabled());
+        assertTrue(new AddImageryLayerAction(new ImageryInfo("foo")).isEnabled());
         assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).isEnabled());
         assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_bing", "http://bar", "bing", null, null)).isEnabled());
@@ -71,5 +71,5 @@
         assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
         try {
-            new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null);
+            new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null);
         } catch (IllegalArgumentException expected) {
             assertEquals("Parameter 'info.url' must not be null", expected.getMessage());