Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17423)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17424)
@@ -490,4 +490,8 @@
             if (factory != null) {
                 PreferenceSetting setting = factory.createPreferenceSetting();
+                if (setting instanceof TabPreferenceSetting && ((TabPreferenceSetting) setting).getIconName() == null) {
+                    Logging.error("Invalid setting (Icon missing): " + setting.getClass().getName());
+                    setting = null;
+                }
                 if (setting != null) {
                     settings.add(setting);
@@ -524,5 +528,5 @@
     }
 
-    private String htmlTabTitle(String title, int maxWidth) {
+    private static String htmlTabTitle(String title, int maxWidth) {
         // Width is set to force left alignment, see https://stackoverflow.com/a/33781096/2257172
         return "<html><div style='padding-left:5px; width:" + maxWidth + "px'>" + title + "</div></html>";
