From 8c17586588455116f6f7c4b85f8a6a28fdadb456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Srbeck=C3=BD?= <dsrbecky@gmail.com>
Date: Tue, 27 Jul 2010 14:40:15 +0000
Subject: [PATCH] Friendlier error message in debugger console

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6279 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../NRefactory/Visitors/ExpressionEvaluator.cs            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs b/src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
index ba88af4a6d..4dba7629ce 100644
--- a/src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
+++ b/src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
@@ -524,10 +524,14 @@ namespace ICSharpCode.NRefactory.Visitors
 				// Instance
 				target = Evaluate(memberReferenceExpression.TargetObject);
 				targetType = target.Type;
-			} catch (GetValueException) {
+			} catch (GetValueException e) {
 				// Static
 				target = null;
-				targetType = memberReferenceExpression.TargetObject.ResolveType(context.AppDomain);
+				try {
+					targetType = memberReferenceExpression.TargetObject.ResolveType(context.AppDomain);
+				} catch (GetValueException) {
+					throw e;  // Use the other, nicer message
+				}
 			}
 			MemberInfo[] memberInfos = targetType.GetMember(memberReferenceExpression.MemberName, DebugType.BindingFlagsAllInScope);
 			if (memberInfos.Length == 0)