From 83026098faf5aaa1169663389816c752ff63dd8f Mon Sep 17 00:00:00 2001
From: Tobias Gummesson <tttobbe@hotmail.com>
Date: Thu, 11 Jul 2013 01:20:00 -0700
Subject: [PATCH] Throws a XamlLoadException with an error message describing
 the error instead of a NullReferenceException in the case where the document
 failed to load.

---
 .../WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
index ba19940906..336bf9719c 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
@@ -89,6 +89,15 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			
 			loadSettings.ReportErrors(xamlErrorService);
 			
+			if (_doc == null) {
+				string message;
+				if (xamlErrorService != null && xamlErrorService.Errors.Count > 0)
+					message = xamlErrorService.Errors[0].Message;
+				else
+					message = "Could not load document.";
+				throw new XamlLoadException(message);
+			}
+			
 			_rootItem = _componentService.RegisterXamlComponentRecursive(_doc.RootElement);
 			
 			if(_rootItem!=null){