diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs
index 4e1e1beefa..d7ae7f837c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs
@@ -189,8 +189,10 @@ namespace Debugger.AddIn
 					default:
 						throw new NotImplementedException("BinaryOperator: " + binaryOperatorExpression.Op);
 				}
-			} catch (System.Exception e) {
-				throw new GetValueException(e.Message);
+			} catch (NotImplementedException e) {
+				throw e;
+			} catch (System.Exception e2) {
+				throw new GetValueException(e2.Message);
 			}
 			
 			return val;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index 14a91d2e42..8c337c4cae 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -565,7 +565,9 @@ namespace ICSharpCode.SharpDevelop.Services
 				else
 					return false;
 			} catch (GetValueException e) {
-				WorkbenchSingleton.SafeThreadAsyncCall(MessageService.ShowError, e);
+				string errorMessage = "Error while evaluating breakpoint condition " + code + ":\n" + e.Message + "\n";
+				DebuggerService.PrintDebugMessage(errorMessage);
+				WorkbenchSingleton.SafeThreadAsyncCall(MessageService.ShowWarning, errorMessage);
 				return true;
 			}
 		}