diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py
index 3441f228d..25513015e 100644
--- a/src/common/xmpp/transports_nb.py
+++ b/src/common/xmpp/transports_nb.py
@@ -219,7 +219,10 @@ class NonBlockingTcp(PlugIn, IdleObject):
 		elif not received :
 			if errnum != socket.SSL_ERROR_EOF: 
 				# 8 EOF occurred in violation of protocol
-				self.DEBUG('Socket error while receiving data', 'error') 
+				self.DEBUG('Socket error while receiving data', 'error')
+				# TODO: change with on_connect_failure,  needs some 
+				# changes in connection.py in order to work properly
+				self.pollend()
 			if self.state >= 0:
 				self.disconnect()
 			return