diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
index 04ec0eb23fb3..45af0e10ac72 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
@@ -257,7 +257,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
 
     @Nullable
     private Evaluator accept(@Nullable PsiElement element) {
-      if (element == null) {
+      if (element == null || element instanceof PsiEmptyStatement) {
         return null;
       }
       element.accept(this);