diff --git a/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java b/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
index 284b80401cea..fb2ae2ce4d21 100644
--- a/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
+++ b/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
@@ -62,6 +62,9 @@ public class PsiInvalidElementAccessException extends RuntimeException implement
     if (element == null) {
       myMessage = message;
       myDiagnostic = Attachment.EMPTY_ARRAY;
+    } else if (element == PsiUtilCore.NULL_PSI_ELEMENT) {
+      myMessage = "NULL_PSI_ELEMENT ;" + message;
+      myDiagnostic = Attachment.EMPTY_ARRAY;
     } else {
       boolean recursiveInvocation = Boolean.TRUE.equals(element.getUserData(REPORTING_EXCEPTION));
       element.putUserData(REPORTING_EXCEPTION, Boolean.TRUE);