From ffc8e9f7a96ce65bf3e563d51410da3cda1ca16d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 23 Jul 2017 01:13:57 +0300
Subject: [PATCH] Fixed NRE in GetBaseUri/GetLocalAssembly

---
 .../PortableXaml/TypeDescriptorExtensions.cs                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
index de1b3fb977..81525fef7d 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
@@ -62,12 +62,12 @@ namespace Portable.Xaml.ComponentModel
 
         public static Uri GetBaseUri(this ITypeDescriptorContext ctx)
         {
-            return ctx.GetWriterSettings()?.Context.BaseUri;
+            return ctx.GetWriterSettings()?.Context?.BaseUri;
         }
 
         public static Assembly GetLocalAssembly(this ITypeDescriptorContext ctx)
         {
-            return ctx.GetWriterSettings()?.Context.LocalAssembly;
+            return ctx.GetWriterSettings()?.Context?.LocalAssembly;
         }
 
         public static AvaloniaXamlContext GetAvaloniaXamlContext(this ITypeDescriptorContext ctx)