diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index 6f26cfc..55f05ba 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -438,11 +438,16 @@
         return handle
 
     def exitFromSsh( self, handle, ipAddress ):
-        handle.sendline( "logout" )
         try:
+            handle.sendline( "logout" )
             handle.expect( "closed." )
             main.log.info ( "Successfully closed ssh connection from " + ipAddress )
         except pexpect.EOF:
             main.log.error( "Failed to close the connection from " + ipAddress )
-        handle.sendline( "" )
-        handle.expect( self.prompt )
\ No newline at end of file
+        try:
+            # check that this component handle still works
+            self.handle.sendline( "" )
+            self.handle.expect( self.prompt )
+        except pexpect.EOF:
+            main.log.error( self.handle.before )
+            main.log.error( "EOF after closing ssh connection" )