From 49ca7afd593a25945cdf3c18b7b03856091e5425 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 14 Dec 2017 20:12:21 +0300
Subject: [PATCH] NPE: PyFrameAccessor.evaluate(expression)

---
 .../python/debugger/containerview/PyDataViewerPanel.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.java b/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.java
index 30d29b05f6cb..97aee98afc92 100644
--- a/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.java
+++ b/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.java
@@ -218,8 +218,8 @@ public class PyDataViewerPanel extends JPanel {
   private PyDebugValue getDebugValue(String expression) {
     try {
       PyDebugValue value = myFrameAccessor.evaluate(expression, false, true);
-      if (value.isErrorOnEval()) {
-        setError(value.getValue());
+      if (value == null || value.isErrorOnEval()) {
+        setError(value != null ? value.getValue() : "Failed to evaluate expression " + expression);
         return null;
       }
       return value;