From 644a7e851787181536e6cd9b8b99218dec43dffe Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 9 Feb 2011 16:03:02 +0300
Subject: [PATCH] NPE

---
 platform/lang-api/src/com/intellij/psi/impl/ElementBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java b/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
index 0a6439579472..99f6fc642074 100644
--- a/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
+++ b/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
@@ -52,7 +52,7 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
   private static final NullableFunction<ElementIconRequest,Icon> ICON_COMPUTE = new NullableFunction<ElementIconRequest, Icon>() {
     public Icon fun(ElementIconRequest request) {
       final PsiElement element = request.getElement();
-      if (!element.isValid()) return null;
+      if (element == null || !element.isValid()) return null;
       if (element.getProject().isDisposed()) return null;
       return computeIconNow(element, request.getFlags());
     }