From 2b3679b13ed5cd30967af2ba6087dcda06cc52e2 Mon Sep 17 00:00:00 2001
From: Maxim Mossienko <Maxim.Mossienko@jetbrains.com>
Date: Thu, 17 Feb 2005 15:41:09 +0300
Subject: [PATCH] NPE fixed

---
 source/com/intellij/codeInsight/javadoc/JavaDocManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/com/intellij/codeInsight/javadoc/JavaDocManager.java b/source/com/intellij/codeInsight/javadoc/JavaDocManager.java
index bc94cadbedef..c00ff21f4bf8 100644
--- a/source/com/intellij/codeInsight/javadoc/JavaDocManager.java
+++ b/source/com/intellij/codeInsight/javadoc/JavaDocManager.java
@@ -589,7 +589,7 @@ public class JavaDocManager implements ProjectComponent {
 
   public DocumentationProvider getProviderFromElement(final PsiElement element) {
     PsiElement originalElement = element!=null ? element.getUserData(ORIGINAL_ELEMENT_KEY):null;
-    PsiFile containingFile = (originalElement!=null)?originalElement.getContainingFile() : element.getContainingFile();
+    PsiFile containingFile = (originalElement!=null)?originalElement.getContainingFile() : (element!=null)?element.getContainingFile():null;
     VirtualFile vfile = (containingFile!=null)?containingFile.getVirtualFile() : null;
 
     return (vfile!=null)?getProvider(vfile.getFileType()):null;