From 6b6b65ecd6133e8fa36ed61a5603d68b10dd3f7e Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 8 Oct 2014 14:37:21 +0400
Subject: [PATCH] IDEA-130960 Show exception details in evaluate window

---
 .../src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java
index 5e9b2f9f3171..c112af292a1e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java
@@ -85,7 +85,7 @@ public class JavaDebuggerEvaluator extends XDebuggerEvaluator {
         descriptor.setContext(evalContext);
         @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
         EvaluateException exception = descriptor.getEvaluateException();
-        if (exception != null) {
+        if (exception != null && descriptor.getValue() == null) {
           callback.errorOccurred(exception.getMessage());
           return;
         }