From 40e364bdcbff6166702b0081c35355e16cfe85f3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 28 Nov 2012 20:28:42 +0400
Subject: [PATCH] EA-40484 - NPE: CallerMethodsTreeStructure.buildChildren

---
 .../ide/hierarchy/call/CallerMethodsTreeStructure.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java
index e21896d3a9eb..16ed3e93c250 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java
@@ -46,11 +46,12 @@ public final class CallerMethodsTreeStructure extends HierarchyTreeStructure {
   @Override
   protected final Object[] buildChildren(final HierarchyNodeDescriptor descriptor) {
     final PsiMember enclosingElement = ((CallHierarchyNodeDescriptor)descriptor).getEnclosingElement();
-    if (!(enclosingElement instanceof PsiMethod)) {
+    HierarchyNodeDescriptor nodeDescriptor = getBaseDescriptor();
+    if (!(enclosingElement instanceof PsiMethod) || nodeDescriptor == null) {
       return ArrayUtil.EMPTY_OBJECT_ARRAY;
     }
     final PsiMethod method = (PsiMethod)enclosingElement;
-    final PsiMethod baseMethod = (PsiMethod)((CallHierarchyNodeDescriptor)getBaseDescriptor()).getTargetElement();
+    final PsiMethod baseMethod = (PsiMethod)((CallHierarchyNodeDescriptor)nodeDescriptor).getTargetElement();
     final SearchScope searchScope = getSearchScope(myScopeType, baseMethod.getContainingClass());
 
     final PsiClass originalClass = method.getContainingClass();