Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9623)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9624)
@@ -470,7 +470,9 @@
 
         for (PreferenceSettingFactory factory : factories) {
-            PreferenceSetting setting = factory.createPreferenceSetting();
-            if (setting != null) {
-                settings.add(setting);
+            if (factory != null) {
+                PreferenceSetting setting = factory.createPreferenceSetting();
+                if (setting != null) {
+                    settings.add(setting);
+                }
             }
         }