From 388324dd69c80fbd20bd7ee95bbb72f85359ac3a Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Thu, 5 May 2011 23:03:17 +1200
Subject: [PATCH] Throw a sane exception when trying to load an invalid widget.

---
 OpenRA.Game/Widgets/WidgetLoader.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Game/Widgets/WidgetLoader.cs b/OpenRA.Game/Widgets/WidgetLoader.cs
index 8c43c78747..662148918e 100644
--- a/OpenRA.Game/Widgets/WidgetLoader.cs
+++ b/OpenRA.Game/Widgets/WidgetLoader.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Widgets;
+using System.IO;
 
 namespace OpenRA
 {
@@ -28,7 +29,11 @@ namespace OpenRA
 
 		public Widget LoadWidget( Dictionary<string, object> args, Widget parent, string w )
 		{
-			return LoadWidget( args, parent, widgets[ w ] );
+			MiniYamlNode ret;
+			if (!widgets.TryGetValue(w, out ret))
+				throw new InvalidDataException("Cannot find widget with Id `{0}`".F(w));
+			
+			return LoadWidget( args, parent, ret );
 		}
 
 		public Widget LoadWidget( Dictionary<string, object> args, Widget parent, MiniYamlNode node)