From 3efac3287e8d47600ba61ffdafd09473dc004909 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Fri, 14 Aug 2020 14:09:12 +0100
Subject: [PATCH] Fix Session.Deserialize error handling.

---
 OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index 4f9c27f54d..7d796fc59e 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -846,17 +846,16 @@ namespace OpenRA.Mods.Common.Server
 				return true;
 			}
 
-			var lobbyInfo = Session.Deserialize(s);
-			if (lobbyInfo == null)
+			try
+			{
+				server.LobbyInfo = Session.Deserialize(s);
+				server.SyncLobbyInfo();
+			}
+			catch (Exception)
 			{
 				server.SendOrderTo(conn, "Message", "Invalid Lobby Info Sent");
-				return true;
 			}
 
-			server.LobbyInfo = lobbyInfo;
-
-			server.SyncLobbyInfo();
-
 			return true;
 		}