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){