From f423dbbb1de22222abf01bdfdcd9f7fec5c20d8c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 2 Jun 2018 15:45:05 -0500
Subject: [PATCH] Fix codepath where the property is a value type but the
 weakreference has been collected.

---
 src/Avalonia.Base/Data/Core/SettableNode.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Data/Core/SettableNode.cs b/src/Avalonia.Base/Data/Core/SettableNode.cs
index 1f6ec0bff4..092cdbe48f 100644
--- a/src/Avalonia.Base/Data/Core/SettableNode.cs
+++ b/src/Avalonia.Base/Data/Core/SettableNode.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Data.Core
             }
             if (PropertyType.IsValueType)
             {
-                return LastValue?.Target.Equals(value) ?? false;
+                return LastValue?.Target != null && LastValue.Target.Equals(value);
             }
             return LastValue != null && Object.ReferenceEquals(LastValue?.Target, value);
         }