diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py
index 95200d6fa8cf4f44d15bfbc9a5a2f7212de93a41..60e6a116697dcf850263649dd13b576f5b64ddb3 100644
--- a/tes/sshwrapper/__init__.py
+++ b/tes/sshwrapper/__init__.py
@@ -327,7 +327,7 @@ class Ssh:
         except subprocess.TimeoutExpired as e:
             exec_p.kill()
             (stdout, stderr) = exec_p.communicate(timeout=TIMEOUT)
-        if exec_p.returncode != 0:
+        if exec_p.returncode != 0 or b'Control socket connect' in stderr:
             try:
                 ctrl_p = sess.ctrl_processes[ctrlsocket]
             except KeyError as e: