diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs
index 38432c5f53..1279ab1e39 100644
--- a/OpenRA.Game/Support/Program.cs
+++ b/OpenRA.Game/Support/Program.cs
@@ -24,7 +24,7 @@ namespace OpenRA
 			// brutal hack
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 
-			if (Debugger.IsAttached)
+			if (Debugger.IsAttached || args.Contains("--just-die"))
 			{
 				Run(args);
 				return;