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