Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 5972)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 5973)
@@ -201,5 +201,5 @@
             @Override
             public boolean identify(TabPreferenceSetting tps, Object name) {
-                return tps != null && tps.getIconName().equals(name);
+                return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name);
             }}, name);
     }