Trying to unload a bad plugin throws NPE in plugin-admin page.

java.lang.NullPointerException
at org.jivesoftware.wildfire.container.PluginServlet.unregisterServlets(PluginServlet.java:204)
at org.jivesoftware.wildfire.container.PluginManager.unloadPlugin(PluginManager.java:496)
at org.jivesoftware.wildfire.admin.plugin_002dadmin_jsp._jspService(plugin_002dadmin_jsp.java:116)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:94)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:689)
at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:428)
at org.mortbay.jetty.servlet.WebApplicationHandler$CachedChain.doFilter(WebApplicationHandler.java:830)
at com.opensymphony.module.sitemesh.filter.PageFilter.parsePage(PageFilter.ja