diff --git a/zunclient/common/websocketclient/websocketclient.py b/zunclient/common/websocketclient/websocketclient.py
index 92271585..98c8688d 100644
--- a/zunclient/common/websocketclient/websocketclient.py
+++ b/zunclient/common/websocketclient/websocketclient.py
@@ -77,9 +77,11 @@ class BaseClient(object):
     def start_loop(self):
         self.poll = select.poll()
         self.poll.register(sys.stdin,
-                           select.POLLIN | select.POLLHUP | select.POLLPRI)
+                           select.POLLIN | select.POLLHUP
+                           | select.POLLPRI | select.POLLNVAL)
         self.poll.register(self.fileno(),
-                           select.POLLIN | select.POLLHUP | select.POLLPRI)
+                           select.POLLIN | select.POLLHUP |
+                           select.POLLPRI | select.POLLNVAL)
 
         self.start_of_line = False
         self.read_escape = False