diff --git a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
index 4701484..ec4cebf 100644
--- a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
+++ b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
@@ -65,6 +65,7 @@
             // Close the acceptor
             //
             acceptor_.close();
+            orbInstance_.getServerPhaser().arriveAndDeregister();
 
         }
     }
@@ -174,7 +175,7 @@
     //
     // Run method for starter thread
     //
-    public void starterRun() {
+    private void starterRun() {
         while (true) {
             //
             // Get new transport, blocking
@@ -247,7 +248,6 @@
 
                 if (state_ == StateClosed) {
                     logger.fine("Shutting down server thread"); 
-                    orbInstance_.getServerPhaser().arrive();
                     break;
                 }
             }