diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs
index 4576bc3f2f..722729a0d2 100644
--- a/OpenRA.Game/Widgets/Widget.cs
+++ b/OpenRA.Game/Widgets/Widget.cs
@@ -318,7 +318,8 @@ namespace OpenRA.Widgets
 
 		public T GetWidget<T>(string id) where T : Widget
 		{
-			return (T)GetWidget(id);
+			var widget = GetWidget(id);
+			return (widget != null)? (T) widget : null;
 		}
 		
 		public void CloseWindow()