From 37d34713bf8942db147d0abb547b0b3fdea64179 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Mon, 29 Dec 2014 14:11:35 +0100
Subject: [PATCH] Null Ref fix

---
 .../WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
index d408c95746..b4be953816 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
@@ -203,8 +203,10 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			ResetInternal();
 
 			propertyValue = value;
-			propertyValue.ParentProperty = this;
-			propertyValue.AddNodeTo(this);
+			if (propertyValue != null) {
+				propertyValue.ParentProperty = this;
+				propertyValue.AddNodeTo(this);
+			}
 			UpdateValueOnInstance();
 
 			ParentObject.OnPropertyChanged(this);