diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
index c1278ff70f..9124c78824 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
@@ -121,6 +121,15 @@ namespace Debugger
 			
 			ICorDebugValue[] args = getArgs();
 			
+			if (args == null) {
+				error = "Can not evaluate property of property";
+				evalState = EvalState.Error;
+				if (EvalComplete != null) {
+					EvalComplete(this, new EvalEventArgs(this));
+				}
+				return false;
+			}
+			
 			// TODO: What if this thread is not suitable?
 			corEval = targetThread.CorThread.CreateEval();
 			
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs
index c40cc9e3e1..a37b3c381b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs
@@ -185,10 +185,15 @@ namespace Debugger
 			ICorDebugFunction evalCorFunction = Module.CorModule.GetFunctionFromToken(method.Token);
 			
 			return new Eval(debugger, evalCorFunction, delegate {
-			                	if (method.IsStatic) {
-			                		return new ICorDebugValue[] {};
+			                	Value updatedVal = getter();
+			                	if (this.IsEquivalentValue(updatedVal) && ((ObjectValue)updatedVal).SoftReference != null) {
+				                	if (method.IsStatic) {
+				                		return new ICorDebugValue[] {};
+				                	} else {
+				                		return new ICorDebugValue[] {((ObjectValue)updatedVal).SoftReference.CastTo<ICorDebugValue>()};
+				                	}
 			                	} else {
-			                		return new ICorDebugValue[] {((ObjectValue)getter()).SoftReference.CastTo<ICorDebugValue>()};
+			                		return null;
 			                	}
 			                });
 		}