diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 804939411b..df0c10f46a 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -362,7 +362,7 @@ namespace OpenRA
 			InitializeWithMod(Settings.Game.Mod, args.GetValue("Launch.Replay", null));
 
 			if (Settings.Server.DiscoverNatDevices)
-				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.TryStoppingNatDiscovery);
+				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.StoppingNatDiscovery);
 		}
 
 		public static void InitializeWithMod(string mod, string replay)
diff --git a/OpenRA.Game/Network/UPnP.cs b/OpenRA.Game/Network/UPnP.cs
index dcca301d6f..e05c4f26a5 100644
--- a/OpenRA.Game/Network/UPnP.cs
+++ b/OpenRA.Game/Network/UPnP.cs
@@ -37,21 +37,11 @@ namespace OpenRA.Network
 			}
 		}
 
-		public static void TryStoppingNatDiscovery()
+		public static void StoppingNatDiscovery()
 		{
 			Log.Write("server", "Stopping NAT discovery.");
+			NatUtility.StopDiscovery();
 
-			try
-			{
-				NatUtility.StopDiscovery();
-			}
-			catch (Exception e)
-			{
-				Log.Write("server", "Failed to stop NAT device discovery: {0}", e);
-				Game.Settings.Server.NatDeviceAvailable = false;
-				Game.Settings.Server.AllowPortForward = false;
-			}
-				
 			if (NatDevice == null)
 			{
 				Log.Write("server", "No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Game.Settings.Server.NatDiscoveryTimeout));