Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1132)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1133)
@@ -242,9 +242,8 @@
 		int width = pluginPanel.myGetWidth();
 
-		// the following could probably be done more elegantly?
 		Collection<String> enabledPlugins = Main.pref.getCollection("plugins", null);
 		
 		for (final PluginDescription plugin : availablePlugins) {
-			boolean enabled = enabledPlugins.contains(plugin.name);
+			boolean enabled = enabledPlugins != null && enabledPlugins.contains(plugin.name);
 			String remoteversion = plugin.version;
 			if(remoteversion == null || remoteversion.equals(""))