From 8c61dbb2e7e595d54c6c404d3ac8662f28f0a6fb Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 10 Aug 2015 17:22:06 +0300
Subject: [PATCH] EA-71679 - NPE: XDebuggerEvaluateActionHandler.showDialog

---
 .../handlers/XDebuggerEvaluateActionHandler.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
index 92e353b9346c..9afff78ef6e5 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
@@ -79,12 +79,14 @@ public class XDebuggerEvaluateActionHandler extends XDebuggerActionHandler {
         value.calculateEvaluationExpression().done(new Consumer<XExpression>() {
           @Override
           public void consume(final XExpression expression) {
-            AppUIUtil.invokeOnEdt(new Runnable() {
-              @Override
-              public void run() {
-                showDialog(session, file, editorsProvider, stackFrame, evaluator, expression);
-              }
-            });
+            if (expression != null) {
+              AppUIUtil.invokeOnEdt(new Runnable() {
+                @Override
+                public void run() {
+                  showDialog(session, file, editorsProvider, stackFrame, evaluator, expression);
+                }
+              });
+            }
           }
         });
         return;
@@ -100,7 +102,7 @@ public class XDebuggerEvaluateActionHandler extends XDebuggerActionHandler {
                                  XDebuggerEditorsProvider editorsProvider,
                                  XStackFrame stackFrame,
                                  XDebuggerEvaluator evaluator,
-                                 XExpression expression) {
+                                 @NotNull XExpression expression) {
     if (expression.getLanguage() == null) {
       Language language = null;
       if (stackFrame != null) {
-- 
2.32.0