diff --git a/src/Client.cpp b/src/Client.cpp
index b28921f66e9c6abd0655268ef3bb750ab15c3366..fc240a24720750d30c04aab8c8f317e101673bca 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -249,10 +249,12 @@ void Client::handleUpdateLists(const boost::system::error_code& errorCode)
     else if(errorCode == boost::asio::error::operation_aborted)
     {
         DEBUG_STREAM << "Client::handleUpdateLists() STOP" << endl;
+
+        //TODO: change state and status
     }
     else
     {
-        ERROR_STREAM << "Client::handleResolve() " << errorCode.message() << endl;
+        ERROR_STREAM << "Client::handleUpdateLists() " << errorCode.message() << endl;
 
         writeState(Tango::ALARM);
         writeStatus(errorCode.message());
@@ -549,10 +551,14 @@ void Client::resetConnection()
     {
         ERROR_STREAM << "Client::resetConnection() Connection timeout" << endl;
 
+        m_resetConnectionTimer.expires_at(boost::posix_time::pos_infin);
+
         closeConnection();
 
         startUpdateLists();
     }
+
+    m_resetConnectionTimer.async_wait(boost::bind(&Client::resetConnection, this));
 }
 
 //==============================================================================
diff --git a/src/SSLClient.cpp b/src/SSLClient.cpp
index 43b2a41689ae363b44dc93d03ffd862597f10913..e3553e6fc0280c9202b7b8315e57cfa927cb3230 100644
--- a/src/SSLClient.cpp
+++ b/src/SSLClient.cpp
@@ -84,7 +84,7 @@ void SSLClient::startConnect(boost::asio::ip::tcp::resolver::iterator endPointIt
     }
     else
     {
-        ERROR_STREAM << "PlainClient::startConnect() No more endpoint" << endl;
+        ERROR_STREAM << "SSLClient::startConnect() No more endpoint" << endl;
 
         writeState(Tango::ALARM);
         writeStatus("No more endpoint");
@@ -105,7 +105,7 @@ void SSLClient::handleConnect(const boost::system::error_code& errorCode,
     }
     else
     {
-        ERROR_STREAM << "PlainClient::handleConnect() " << errorCode.message() << endl;
+        ERROR_STREAM << "SSLClient::handleConnect() " << errorCode.message() << endl;
 
         writeState(Tango::ALARM);
         writeStatus(errorCode.message());