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();