diff --git a/src/Config.py b/src/Config.py
index f3704a18..f82873b5 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.3.4"
-        self.rev = 667
+        self.rev = 668
         self.argv = argv
         self.action = None
         self.createParser()
diff --git a/src/Ui/UiServer.py b/src/Ui/UiServer.py
index f8d7345f..9c9592d4 100644
--- a/src/Ui/UiServer.py
+++ b/src/Ui/UiServer.py
@@ -2,6 +2,7 @@ import logging
 import time
 import cgi
 import socket
+import sys
 
 from gevent.pywsgi import WSGIServer
 from gevent.pywsgi import WSGIHandler
@@ -119,7 +120,11 @@ class UiServer:
 
         self.server = WSGIServer((self.ip.replace("*", ""), self.port), handler, handler_class=UiWSGIHandler, log=self.log)
         self.server.sockets = {}
-        self.server.serve_forever()
+        try:
+            self.server.serve_forever()
+        except Exception, err:
+            self.log.error("Web interface bind error, must be running already, exiting.... %s" % err)
+            sys.modules["main"].file_server.stop()
         self.log.debug("Stopped.")
 
     def stop(self):