1 files changed, 4 insertions, 2 deletions
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 f2178c1d4fb5..2eab90666967 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebuggerEvaluator.java
@@ -82,9 +82,11 @@ public class JavaDebuggerEvaluator extends XDebuggerEvaluator {
           return;
         }
         JavaDebugProcess process = myDebugProcess.getXdebugProcess();
-        if (process != null) {
-          callback.evaluated(JavaValue.create(null, descriptor, evalContext, process.getNodeManager(), true));
+        if (process == null) {
+          callback.errorOccurred("No debug process");
+          return;
         }
+        callback.evaluated(JavaValue.create(null, descriptor, evalContext, process.getNodeManager(), true));
       }
     });
   }