diff --git a/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/PropertyList/Property.cs b/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/PropertyList/Property.cs
index 61fa49f4..4ae02866 100644
--- a/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/PropertyList/Property.cs
+++ b/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/PropertyList/Property.cs
@@ -125,7 +125,20 @@ namespace UniversalEditor.ObjectModels.PropertyList
 		}
 		public override string ToString()
 		{
-			return mvarName + " = \"" + mvarValue.ToString() + "\"";
+			string sValue = String.Empty;
+			if (mvarValue == null)
+			{
+				sValue = "null";
+			}
+			else if (mvarValue is string)
+			{
+				sValue = "\"" + mvarValue.ToString() + "\"";
+			}
+			else
+			{
+				sValue = mvarValue.ToString();
+			}
+			return String.Format("{0} = {1}", mvarName, sValue);
 		}
 
 		public Property()