diff --git a/Subsurface/Source/Events/Missions/Mission.cs b/Subsurface/Source/Events/Missions/Mission.cs
index 6810e91f5..119957f6a 100644
--- a/Subsurface/Source/Events/Missions/Mission.cs
+++ b/Subsurface/Source/Events/Missions/Mission.cs
@@ -244,7 +244,7 @@ namespace Barotrauma
             string header = index < headers.Count ? headers[index] : "";
             string message = index < messages.Count ? messages[index] : "";
 
-            GameServer.Log("Mission info: " + header + " - " + message, ServerLog.MessageType.Error);
+            GameServer.Log("Mission info: " + header + " - " + message, ServerLog.MessageType.ServerMessage);
 
             new GUIMessageBox(header, message);
         }
diff --git a/Subsurface/Source/GameSession/GameModes/MissionMode.cs b/Subsurface/Source/GameSession/GameModes/MissionMode.cs
index 55a48f513..353d1d66b 100644
--- a/Subsurface/Source/GameSession/GameModes/MissionMode.cs
+++ b/Subsurface/Source/GameSession/GameModes/MissionMode.cs
@@ -30,8 +30,8 @@ namespace Barotrauma
             var missionMsg = new GUIMessageBox(mission.Name, mission.Description, 400, 400);
             missionMsg.UserData = "missionstartmessage";
 
-            Networking.GameServer.Log("Mission: " + mission.Name, Networking.ServerLog.MessageType.Error);
-            Networking.GameServer.Log(mission.Description, Networking.ServerLog.MessageType.Error);
+            Networking.GameServer.Log("Mission: " + mission.Name, Networking.ServerLog.MessageType.ServerMessage);
+            Networking.GameServer.Log(mission.Description, Networking.ServerLog.MessageType.ServerMessage);
         }
     }
 }
diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs
index cc42e4321..2ed1c12ee 100644
--- a/Subsurface/Source/Screens/NetLobbyScreen.cs
+++ b/Subsurface/Source/Screens/NetLobbyScreen.cs
@@ -1,9 +1,7 @@
 using System;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Barotrauma.Networking;
-using System.IO;
 using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/Subsurface/Source/Screens/ServerListScreen.cs b/Subsurface/Source/Screens/ServerListScreen.cs
index 8811f13e9..34d823409 100644
--- a/Subsurface/Source/Screens/ServerListScreen.cs
+++ b/Subsurface/Source/Screens/ServerListScreen.cs
@@ -139,7 +139,6 @@ namespace Barotrauma
             if (string.IsNullOrWhiteSpace(masterServerData))
             {
                 new GUITextBlock(new Rectangle(0, 0, 0, 20), "Couldn't find any servers", "", serverList);
-
                 return;
             }
 
@@ -206,16 +205,9 @@ namespace Barotrauma
 
 
             var request = new RestRequest("masterserver2.php", Method.GET);
-            request.AddParameter("gamename", "barotrauma"); // adds to POST or URL querystring based on Method
-            request.AddParameter("action", "listservers"); // adds to POST or URL querystring based on Method
-
-
-            // easily add HTTP Headers
-            //request.AddHeader("header", "value");
-
-            //// add files to upload (works with compatible verbs)
-            //request.AddFile(path);
-
+            request.AddParameter("gamename", "barotrauma");
+            request.AddParameter("action", "listservers");
+            
             // execute the request
             masterServerResponded = false;
             var restRequestHandle = client.ExecuteAsync(request, response => MasterServerCallBack(response));
@@ -224,10 +216,10 @@ namespace Barotrauma
             while (!masterServerResponded)
             {
                 if (DateTime.Now > timeOut)
-                { 
+                {
                     serverList.ClearChildren();
                     restRequestHandle.Abort();
-                    DebugConsole.ThrowError("Couldn't connect to master server (request timed out)");
+                    new GUIMessageBox("Connection error", "Couldn't connect to master server (request timed out).");
                     yield return CoroutineStatus.Success;
                 }
                 yield return CoroutineStatus.Running;
@@ -236,7 +228,7 @@ namespace Barotrauma
             if (masterServerResponse.ErrorException != null)
             {
                 serverList.ClearChildren();
-                DebugConsole.ThrowError("Error while connecting to master server", masterServerResponse.ErrorException);
+                new GUIMessageBox("Connection error", "Error while connecting to master server {" + masterServerResponse.ErrorException + "}");
             }
             else if (masterServerResponse.StatusCode != System.Net.HttpStatusCode.OK)
             {
@@ -245,14 +237,17 @@ namespace Barotrauma
                 switch (masterServerResponse.StatusCode)
                 {
                     case System.Net.HttpStatusCode.NotFound:
-                        DebugConsole.ThrowError("Error while connecting to master server (404 - \"" + NetConfig.MasterServerUrl + "\" not found)");
+                        new GUIMessageBox("Connection error",
+                            "Error while connecting to master server (404 - \"" + NetConfig.MasterServerUrl + "\" not found)");
                         break;
                     case System.Net.HttpStatusCode.ServiceUnavailable:
-                        DebugConsole.ThrowError("Error while connecting to master server (505 - Service Unavailable)");
-                        DebugConsole.ThrowError("The master server may be down for maintenance or temporarily overloaded. Please try again after in a few moments.");
+                        new GUIMessageBox("Connection error",
+                            "Error while connecting to master server (505 - Service Unavailable) " +
+                            "The master server may be down for maintenance or temporarily overloaded. Please try again after in a few moments.");
                         break;
                     default:
-                        DebugConsole.ThrowError("Error while connecting to master server (" + masterServerResponse.StatusCode + ": " + masterServerResponse.StatusDescription + ")");
+                        new GUIMessageBox("Connection error",
+                            "Error while connecting to master server (" + masterServerResponse.StatusCode + ": " + masterServerResponse.StatusDescription + ")");
                         break;
                 }
             }