Index: model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java,v
--- model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java	28 Jul 2011 17:07:39 -0000	1.95
+++ model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java	30 Aug 2011 09:31:52 -0000
@@ -846,6 +846,8 @@ 
 					char[][] memberTypeNames = CharOperation.splitOn('$', typeName, firstDollar+1, typeName.length);
 					for (int i = 0; i < memberTypeNames.length; i++) {
 						this.focusType = this.focusType.getMemberType(memberTypeNames[i]);
+						if (this.focusType == null)
+							return this.focusType;
 					}
 				}
 			}