diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleIdentifierExpression.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleIdentifierExpression.cs
index 06b63544ed..26e1559dec 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleIdentifierExpression.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleIdentifierExpression.cs
@@ -46,7 +46,7 @@ namespace Debugger.Expressions
 				if (member != null) return member;
 			}
 			
-			throw new GetValueException("Identifier " + identifier + " not found");
+			throw new GetValueException("Identifier \"" + identifier + "\" not found");
 		}
 		
 		#region GetHashCode and Equals
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleMemberReferenceExpression.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleMemberReferenceExpression.cs
index 3a30100e3a..5003f8bf09 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleMemberReferenceExpression.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/SimpleMemberReferenceExpression.cs
@@ -38,7 +38,12 @@ namespace Debugger.Expressions
 		protected override Value EvaluateInternal(StackFrame context)
 		{
 			Value targetValue = targetObject.Evaluate(context);
-			return targetValue.GetMemberValue(member);
+			Value memberValue = targetValue.GetMemberValue(member);
+			if (memberValue != null) {
+				return memberValue;
+			} else {
+				throw new GetValueException("Member \"" + member + "\" not found");
+			}
 		}
 		
 		#region GetHashCode and Equals