Index: /trunk/FACT++/src/StateMachineDim.cc
===================================================================
--- /trunk/FACT++/src/StateMachineDim.cc	(revision 10509)
+++ /trunk/FACT++/src/StateMachineDim.cc	(revision 10510)
@@ -76,6 +76,4 @@
     //    fSrvVersion((name+"/VERSION").c_str(), const_cast<int&>(fVersion)),
 {
-    // WARNING: This exit handler is GLOBAL!
-    DimServer::addExitHandler(this);
     SetDefaultStateNames();
 }
Index: /trunk/FACT++/src/StateMachineDim.h
===================================================================
--- /trunk/FACT++/src/StateMachineDim.h	(revision 10509)
+++ /trunk/FACT++/src/StateMachineDim.h	(revision 10510)
@@ -20,11 +20,13 @@
     DimStart(const std::string &name, MessageImp &imp) : DimErrorRedirecter(imp)
     {
-        DimServer::addErrorHandler(this);
         DimServer::start(name.c_str());
     }
-    ~DimStart() { DimServer::stop(); }
+    ~DimStart()
+    {
+        DimServer::stop();
+    }
 };
 
-class StateMachineDim : public DimCommandHandler, public DimExitHandler, public StateMachine, public DimStart
+class StateMachineDim : public DimCommandHandler, public StateMachine, public DimStart
 {
 private: