diff --git a/DLLSocket/server_controller.py b/DLLSocket/server_controller.py
index 89303755cc..943f37f677 100644
--- a/DLLSocket/server_controller.py
+++ b/DLLSocket/server_controller.py
@@ -13,10 +13,10 @@ last_ticker_state = None
 
 def handle_message(data, addr):
     global last_ticker_state
-    
+
     params = urlparse.parse_qs(data)
     print(data)
-    
+
     try:
         if params["type"][0] == "log" and str(params["log"][0]) and str(params["message"][0]):
             open(params["log"][0],"a+").write(params["message"][0]+"\n")
@@ -24,20 +24,28 @@ def handle_message(data, addr):
         pass
     except KeyError:
         pass
-    
+
     try:
         if params["type"][0] == "ticker_state" and str(params["message"][0]):
             last_ticker_state = str(params["message"][0])
     except KeyError:
         pass
-    
+
     try:
         if params["type"][0] == "startup" and last_ticker_state:
             open("crashlog.txt","a+").write("Server exited, last ticker state was: "+last_ticker_state+"\n")
     except KeyError:
         pass
-            
 
+sock.settimeout(60*6) # 10 minute timeout
 while True:
-    data, addr = sock.recvfrom( 1024 ) # buffer size is 1024 bytes
-    handle_message(data,addr)
\ No newline at end of file
+    try:
+        data, addr = sock.recvfrom( 1024 ) # buffer size is 1024 bytes
+        handle_message(data,addr)
+    except socket.timeout:
+        # try to start the server again
+        print("Server timed out.. attempting restart.")
+        if last_ticker_state:
+                open("crashmsg.txt","a+").write("Server crashed, trying to reboot. last ticker state: "+last_ticker_state+"\n")
+        subprocess.call("killall -9 DreamDaemon")
+        subprocess.call("./start")
\ No newline at end of file