diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
index c44b34f39..9e0a0c951 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
@@ -234,12 +234,14 @@ public class PluginStarter implements Runnable {
                 }
             }
         */
-            Iterator <String> wars = pluginWars.get(appName).iterator();
-            while (wars.hasNext()) {
-                String warName = wars.next();
-                WebAppStarter.stopWebApp(server, warName);
+            if(pluginWars.containsKey(appName)) {
+                Iterator <String> wars = pluginWars.get(appName).iterator();
+                while (wars.hasNext()) {
+                    String warName = wars.next();
+                    WebAppStarter.stopWebApp(server, warName);
+                }
+                pluginWars.get(appName).clear();
             }
-            pluginWars.get(appName).clear();
         }
 
         // remove summary bar link
diff --git a/history.txt b/history.txt
index 0078e2f73..f0f423446 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2010-11-27 sponge
+   * Plugin: ticket 336 fix NPE
+
 2010-11-27 sponge
    * Slackware: bump i2p-base version, so that it can be upgraded with the new
 	base code fixes.