diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs index d7c1ee71f0..b34433a5bd 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs @@ -130,8 +130,16 @@ namespace Debugger } else if ((uint)e.ErrorCode == 0x80131C22) { // The operation is illegal because of a stack overflow. throw new GetValueException("Can not evaluate after stack overflow"); + } else if ((uint)e.ErrorCode == 0x80131313) { + // Func eval cannot work. Bad starting point. + // Reproduction circumstancess are unknown + throw new GetValueException("Func eval cannot work. Bad starting point."); } else { - throw; + #if DEBUG + throw; // Expose for more diagnostics + #else + throw new GetValueException(e.Message); + #endif } }