From d2dcc732e449896d4a54ce97a3b05635450a49d5 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 10 Nov 2010 08:49:30 +0300
Subject: [PATCH] fix NPE

---
 .../engine/evaluation/EvaluateException.java        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
index 3fbef4ddfc15..30dac08cc738 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
@@ -53,4 +53,17 @@ public class EvaluateException extends Exception {
   public void setTargetException(final ObjectReference targetException) {
     myTargetException = targetException;
   }
+
+  public String getMessage() {
+    final String errorMessage = super.getMessage();
+    if (errorMessage != null) {
+      return errorMessage;
+    }
+    final Throwable cause = getCause();
+    final String causeMessage = cause != null? cause.getMessage() : null;
+    if (causeMessage != null) {
+      return causeMessage;
+    }
+    return "unknown error";
+  }
 }
\ No newline at end of file