Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 1187)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 1188)
@@ -392,5 +392,10 @@
 
         try {
-            UIManager.setLookAndFeel(Main.pref.get("laf"));
+            try {
+              UIManager.setLookAndFeel(Main.pref.get("laf"));
+            }
+            catch (final javax.swing.UnsupportedLookAndFeelException e) {
+                System.out.println("Look and Feel not supported: " + Main.pref.get("laf"));
+            }
             toolbar = new ToolbarPreferences();
             contentPane.updateUI();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1187)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1188)
@@ -373,14 +373,11 @@
 
         }
-
         LinkedList<String> plugins = new LinkedList<String>();
-        Object pds[] = pluginMap.keySet().toArray();
-        Arrays.sort(pds);
-        for (Object d : pds) {
-            PluginDescription pd = (PluginDescription)d;
-            if (pluginMap.get(pd.name))
-                plugins.add(pd.name);
-        }
-
+        for (Map.Entry<String, Boolean> d : pluginMap.entrySet()) {
+            if (d.getValue())
+                plugins.add(d.getKey());
+        }
+
+        Collections.sort(plugins);
         return Main.pref.putCollection("plugins", plugins);
     }