Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 13159)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 13160)
@@ -504,10 +504,9 @@
             }
         }
-        try {
-            if (sel != null) {
-                setSelectedComponent(sel);
-            }
-        } catch (IllegalArgumentException e) {
-            Logging.warn(e);
+        if (sel != null) {
+            int index = indexOfComponent(sel);
+            if (index > -1) {
+                setSelectedIndex(index);
+            }
         }
     }