diff --git a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
index a0c8b1e1a3..c5b8af4725 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
@@ -35,8 +35,10 @@ namespace OpenRA.Mods.Common.Server
 			foreach (var kv in server.LobbyInfo.GlobalSettings.LobbyOptions)
 			{
 				Session.LobbyOptionState def;
+				LobbyOption option;
 				if (!defaults.LobbyOptions.TryGetValue(kv.Key, out def) || kv.Value.Value != def.Value)
-					server.SendOrderTo(conn, "Message", options[kv.Key].Name + ": " + kv.Value.Value);
+					if (options.TryGetValue(kv.Key, out option))
+						server.SendOrderTo(conn, "Message", option.Name + ": " + kv.Value.Value);
 			}
 		}
 	}