Merge pull request reactiveui#840 from bradtwurst/master

Improve error exception logging
Koide-S · Apr 23, 2015 · 9532a8d · 9532a8d
2 parents 09c92a8 + 5468bc5
commit 9532a8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ReactiveUI/PropertyBinding.cs b/ReactiveUI/PropertyBinding.cs
@@ -941,7 +941,7 @@ IDisposable bindToDirect<TTarget, TValue>(
                 return This.Subscribe(
                     x => setter(target, x, viewExpression.GetArgumentsArray()),
                     ex => {
-                        this.Log().ErrorException("Binding recieved an Exception!", ex);
+                        this.Log().ErrorException(String.Format("{0} Binding received an Exception!", viewExpression), ex);
                         if (fallbackValue != null) setter(target, fallbackValue(), null);
                     });
             }
@@ -955,7 +955,7 @@ IDisposable bindToDirect<TTarget, TValue>(
                 .Subscribe(
                     x => setter(x.host, x.val, viewExpression.GetArgumentsArray()),
                     ex => {
-                        this.Log().ErrorException("Binding recieved an Exception!", ex);
+                        this.Log().ErrorException(String.Format("{0} Binding received an Exception!", viewExpression), ex);
                         if (fallbackValue != null) setter(target, fallbackValue(), viewExpression.GetArgumentsArray());
                     });
         }

diff --git a/ReactiveUI/Xaml/WpfDependencyObjectObservableForProperty.cs b/ReactiveUI/Xaml/WpfDependencyObjectObservableForProperty.cs
@@ -8,6 +8,7 @@
 using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Reactive.Disposables;
+using Splat;
 
 namespace ReactiveUI
 {
@@ -25,6 +26,11 @@ public IObservable<IObservedChange<object, object>> GetNotificationForProperty(o
             var propertyName = expression.GetMemberInfo().Name;
             var dpd = DependencyPropertyDescriptor.FromProperty(getDependencyProperty(type, propertyName), type);
 
+            if (dpd == null) {
+                this.Log().Error("Couldn't find dependency property " + propertyName + " on " + type.Name);
+                throw new NullReferenceException("Couldn't find dependency property " + propertyName + " on " + type.Name);
+            }
+
             return Observable.Create<IObservedChange<object, object>>(subj => {
                 var handler = new EventHandler((o, e) => {
                     subj.OnNext(new ObservedChange<object, object>(sender, expression));