diff --git a/sql-edition/servers/SerialClient.py b/sql-edition/servers/SerialClient.py
index 4025e3b84edf79dbec03d8c6e905b5c87bc88ae6..e0a9a7e965e95fcd0b86c2eb24917b8a8f49c1e8 100644
--- a/sql-edition/servers/SerialClient.py
+++ b/sql-edition/servers/SerialClient.py
@@ -13,7 +13,7 @@ class SerialClient:
 			bytesize=EIGHTBITS,     #number of databits
 			parity=PARITY_NONE,     #enable parity checking
 			stopbits=STOPBITS_ONE,  #number of stopbits
-			timeout=1,           #set a timeout value, None for waiting forever, return on read
+			timeout=10,           #set a timeout value, None for waiting forever, return on read
 			xonxoff=0,              #enable software flow control
 			rtscts=0,               #enable RTS/CTS flow control
 		)
diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 22591088161469d89ef46de72066037c6632a7ab..ce7583721416ca3f8b788103165cc1d5bfbd6862 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -1091,8 +1091,9 @@ def do_vend_server(options, config_opts):
 		
 		try:
 			run_forever(rfh, wfh, options, config_opts)
-		except VendingException:
+		except VendingException as e:
 			logging.error("Connection died, trying again...")
+			logging.info("Exception: "+e.__str__())
 			logging.info("Trying again in 5 seconds.")
 			sleep(5)