diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
index 2b458cb77466..8efc372f68be 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
@@ -154,6 +154,9 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
 
   @Override
   protected void reformat(PsiElement atCaret) throws IncorrectOperationException {
+    if (atCaret == null) {
+      return;
+    }
     PsiElement parent = atCaret.getParent();
     if (parent instanceof PsiCodeBlock) {
       final PsiCodeBlock block = (PsiCodeBlock) parent;