From 381cd64b1f1859ce0c78638b573bb3fccb8570ad Mon Sep 17 00:00:00 2001
From: "M. ter Woord" <matthijs@terwoord.eu>
Date: Fri, 15 Dec 2017 17:40:54 +0100
Subject: [PATCH] Add the uri to the error message, that way nested load errors
 can be diagnosed much quicker.

---
 .../AvaloniaXamlLoaderPortableXaml.cs              | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
index 0419db5d0f..906bb00863 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
@@ -127,7 +127,19 @@ namespace Avalonia.Markup.Xaml
 
             using (var stream = assetLocator.Open(uri, baseUri))
             {
-                return Load(stream, rootInstance, uri);
+                try
+                {
+                    return Load(stream, rootInstance, uri);
+                }
+                catch (Exception e)
+                {
+                    var uriString = uri.ToString();
+                    if (!uri.IsAbsoluteUri)
+                    {
+                        uriString = new Uri(baseUri, uri).AbsoluteUri;
+                    }
+                    throw new Exception("Error loading xaml at " + uriString, e);
+                }
             }
         }