diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index b25c076f2..149cfd9bc 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -286,6 +286,7 @@ cac::~cac ()
             //
             // shutdown all tcp circuits
             //
+            this->iiuExistenceCount = this->circuitList.count();
             tsDLIter < tcpiiu > iter = this->circuitList.firstIter ();
             while ( iter.valid() ) {
                 // this causes a clean shutdown to occur
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index 214b0687c..7b775cb50 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -1850,10 +1850,7 @@ void tcpiiu::disconnectAllChannels (
     }
 
     this->channelCountTot = 0u;
-
-    if ( ! isNameService () ) {
-        this->initiateCleanShutdown ( guard );
-    }
+    this->initiateCleanShutdown ( guard );
 }
 
 void tcpiiu::unlinkAllChannels ( 
@@ -1912,10 +1909,7 @@ void tcpiiu::unlinkAllChannels (
     }
 
     this->channelCountTot = 0u;
-
-    if ( ! isNameService () ) {
-        this->initiateCleanShutdown ( guard );
-    }
+    this->initiateCleanShutdown ( guard );
 }
 
 void tcpiiu::installChannel (