diff --git a/.gitignore b/.gitignore
index 1d2ebb26f2..d65d9d2e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,10 @@ bin/
 /src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib
 /packages/
 /src/Tools/ResGet/*.log
+
+
+*.ide/
+*.sdsettings
+*.DotSettings.user
+*.suo
+.DS_Store
\ No newline at end of file
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);