Index: /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java	(revision 1817)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java	(revision 1818)
@@ -67,9 +67,14 @@
         for (String pluginName : Main.pref.getCollection("plugins", Collections.<String>emptySet())) {
             PluginInformation local = localPlugins.get(pluginName);
-            PluginInformation description = availablePlugins.get(local.name);
-
-            if (description.version != null && !description.version.equals(local.version)) {
+            PluginInformation description = availablePlugins.get(pluginName);
+
+            if (description == null) {
+                System.out.println(tr("Plug-in named {0} is not available. Update skipped.", pluginName));
+                continue;
+            }
+
+            if (local == null || (description.version != null && !description.version.equals(local.version))) {
                 toUpdate.add(description);
-                toUpdateStr.append(description.name+"\n");
+                toUpdateStr.append(pluginName+"\n");
             }
         }