diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index ad19a7d35ec8..011242583a40 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -204,6 +204,9 @@ public class DocumentationManager {
 
     final PopupUpdateProcessor updateProcessor = new PopupUpdateProcessor(project) {
       public void updatePopup(Object lookupIteObject) {
+        if (lookupIteObject == null) {
+          return;
+        }
         if (lookupIteObject instanceof PsiElement) {
           doShowJavaDocInfo((PsiElement)lookupIteObject, false, this, originalElement, autoupdate);
           return;