diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 1ecd04930..5023cb175 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -514,20 +514,6 @@ string multiSlsDetector::setHostname(const char* name, int pos){
   cout << "-----------------------------set online!" << endl;
 #endif
   setOnline(ONLINE_FLAG);
-  if(pos>=0){
-	if(detectors[pos]->getErrorMask())
-	  setErrorMask(getErrorMask()|(1<<pos));
-  }else{
-	  cprintf(BLUE,"Checking all the detectors %d\n",thisMultiDetector->numberOfDetectors);
-	  for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
-		  if (detectors[ip]) {
-			  if(detectors[ip]->getErrorMask()){
-			  	  setErrorMask(getErrorMask()|(1<<ip));
-			  	  cprintf(BG_RED,"Setting error mask for %d\n",ip);
-			  }
-		  }
-	  }
-  }
 
   return getHostname(pos);
 }
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 0928984ab..78744612e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -1246,6 +1246,7 @@ string slsDetector::checkOnline() {
       delete controlSocket;
       controlSocket=NULL;
       retval = string(thisDetector->hostname);
+      thisDetector->onlineFlag=OFFLINE_FLAG;
 #ifdef VERBOSE
       std::cout<< "offline!" << std::endl;
 #endif
@@ -1253,6 +1254,7 @@ string slsDetector::checkOnline() {
       thisDetector->onlineFlag=ONLINE_FLAG;
       controlSocket->SetTimeOut(100);
       disconnectControl();
+      thisDetector->onlineFlag=ONLINE_FLAG;
 #ifdef VERBOSE
       std::cout<< "online!" << std::endl;
 #endif