From 0c21bef168c7172ef96adb07952b16894e4aaf67 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 14 Sep 2015 21:42:14 +0200
Subject: [PATCH] Fix bug in error message.

'value' was getting overwritten with null.
---
 src/Perspex.Base/PerspexObject.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Perspex.Base/PerspexObject.cs b/src/Perspex.Base/PerspexObject.cs
index 2a0a34e350..83021a62d4 100644
--- a/src/Perspex.Base/PerspexObject.cs
+++ b/src/Perspex.Base/PerspexObject.cs
@@ -494,6 +494,7 @@ namespace Perspex
             Contract.Requires<NullReferenceException>(property != null);
 
             PriorityValue v;
+            var originalValue = value;
 
             if (!IsRegistered(property))
             {
@@ -506,10 +507,10 @@ namespace Perspex
             if (!TypeUtilities.TryCast(property.PropertyType, value, out value))
             {
                 throw new InvalidOperationException(string.Format(
-                    "Invalid value for Property '{0}': {1} ({2})",
+                    "Invalid value for Property '{0}': '{1}' ({2})",
                     property.Name,
-                    value,
-                    value?.GetType().FullName ?? "(null)"));
+                    originalValue,
+                    originalValue?.GetType().FullName ?? "(null)"));
             }
 
             if (!_values.TryGetValue(property, out v))