NPE in SimpleSubDeployerSupport.unregisterClassLoader(), during destroy(DeploymentInfo)

On jboss-shutdown we get:

12:59:22,771 INFO [SnmpAgentService] SNMP agent stopped
12:59:22,791 WARN [ServiceController] Ignoring request to stop nonexistent service: jboss.beans:service=JBossBeanDeployment,name='jbossws.sar#jbossws.beans'
12:59:22,791 WARN [ServiceController] Ignoring request to destroy nonexistent service: jboss.beans:service=JBossBeanDeployment,name='jbossws.sar#jbossws.beans'
12:59:22,791 WARN [JBossBeanDeployer] Error unregistering classloader null java.lang.NullPointerException
at org.jboss.deployment.SimpleSubDeployerSupport.unregisterClassLoader(SimpleSubDeployerSupport.java:280)
at org.jboss.deployment.SimpleSubDeployerSupport.destroy(SimpleSubDeployerSupport.java:160)
at org.jboss.deployment.MainDeployer.destroy(MainDeployer.java:693)
at org.jboss.deployment.MainDeployer.undeploy(MainDeployer.java:632)
at org.jboss.deployment.MainDeployer.shutdown(MainDeployer.java:510)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.jboss.mx.interceptor.ReflectedDispatcher.invoke(ReflectedDispatcher.java:157)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:96)
at org.jboss.mx.interceptor.AbstractInterceptor.invoke(AbstractInterceptor.java:138)
at org.jboss.mx.server.Invocation.invoke(Invocation.java:90)
at org.jboss.mx.interceptor.ModelMBeanOperationInterceptor.invoke(ModelMBeanOperationInterceptor.java:140)
at org.jboss.mx.server.Invocation.invoke(Invocation.java:90)
at org.jboss.mx.server.AbstractMBeanInvoker.invoke(AbstractMBeanInvoker.java:264)
at org.jboss.mx.server.MBeanServerImpl.invoke(MBeanServerImpl.java:668)
at org.jboss.system.server.ServerImpl$ShutdownHook.shutdownDeployments(ServerImpl.java:1049)
at org.jboss.system.server.ServerImpl$ShutdownHook.shutdown(ServerImpl.java:1024)
at org.jboss.system.server.ServerImpl$ShutdownHook.run(ServerImpl.java:987)
12:59:23,292 INFO [Server] Shutdown complete
Shutdown complete

The change in JBAS-3271 introduced an NPE