diff --git a/src/Config.py b/src/Config.py
index 2decbb0a..13047995 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.5"
-        self.rev = 2081
+        self.rev = 2082
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 495bac88..66a741b4 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -65,9 +65,13 @@ class UiWebsocket(object):
 
         while True:
             try:
-                message = ws.receive()
+                if ws.closed:
+                    break
+                else:
+                    message = ws.receive()
             except Exception, err:
-                return "Bye."  # Close connection
+                self.log.error("WebSocket receive error: %s" % Debug.formatException(err))
+                break
 
             if message:
                 try: