diff --git a/lib/client/CClient.cpp b/lib/client/CClient.cpp
index 59bbc4fcf..15092cf62 100644
--- a/lib/client/CClient.cpp
+++ b/lib/client/CClient.cpp
@@ -90,8 +90,11 @@ CClient::connect()
 		socket->connect(m_serverAddress);
 	}
 	catch (XBase& e) {
+		cleanupTimer();
+		cleanupConnecting();
 		delete m_stream;
 		m_stream = NULL;
+		LOG((CLOG_DEBUG1 "connection failed"));
 		sendConnectionFailedEvent(e.what());
 		return;
 	}