Index: src/main/org/jboss/ejb/EJBDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EJBDeployer.java,v
retrieving revision 1.59.4.1
diff -u -r1.59.4.1 EJBDeployer.java
--- src/main/org/jboss/ejb/EJBDeployer.java	7 Dec 2004 12:44:56 -0000	1.59.4.1
+++ src/main/org/jboss/ejb/EJBDeployer.java	14 Feb 2005 18:19:00 -0000
@@ -627,7 +627,9 @@
 
       try
       {
-         serviceController.stop(di.deployedObject);
+         if ( di.deployedObject != null ) {
+            serviceController.stop(di.deployedObject);
+         }
       }
       catch (Exception e)
       {
@@ -645,8 +647,10 @@
 
       try
       {
-         serviceController.destroy( di.deployedObject );
-         serviceController.remove( di.deployedObject );
+         if ( di.deployedObject != null ) {
+            serviceController.destroy( di.deployedObject );
+            serviceController.remove( di.deployedObject );
+         }
       }
       catch (Exception e)
       {