diff --git a/application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/Client.php b/application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/Client.php
index 5fd275d7..f0b8a9b0 100644
--- a/application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/Client.php
+++ b/application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/Client.php
@@ -153,7 +153,7 @@ class Client
 	{
 		$xml = $request->getXml();
 
-		@stream_set_timeout($this->socket, 0, $this->timeout * 1000 * 10);
+		@stream_set_timeout($this->socket, 0, $this->timeout * 1000 * 100);
 		// send request
 		$this->reqhandle++;
 		if ($this->protocol == 1)
@@ -196,7 +196,7 @@ class Client
 		{
 			$size = 0;
 			$recvhandle = 0;
-			@stream_set_timeout($this->socket, 0, $this->timeout * 1000 * 10);
+			@stream_set_timeout($this->socket, 0, $this->timeout * 1000 * 50);
 			// Get result
 			if ($this->protocol == 1)
 			{
diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index af0d4181..2aeccf71 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -325,6 +325,10 @@ class ManiaControl implements CommandListener, TimerListener {
 				$this->callbackManager->manageCallbacks();
 
 			} catch(FatalException $e) {
+				//TODO remove
+				if($this->errorHandler){
+					$this->errorHandler->triggerDebugNotice("Fatal Exception: " . $e->getMessage() . " tracestring " . $e->getTraceAsString());
+				}
 				$this->quit($e->getMessage());
 			}