[451208] Handle broken proxy better for getExtendedClass.

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreLogicalContainerAwareReentrantTypeResolver.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreLogicalContainerAwareReentrantTypeResolver.java
index d9d7edf15..30544b4b6 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreLogicalContainerAwareReentrantTypeResolver.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreLogicalContainerAwareReentrantTypeResolver.java
@@ -18,8 +18,9 @@ public class XcoreLogicalContainerAwareReentrantTypeResolver extends LogicalCont
   @Override
   public JvmTypeReference getExtendedClass(JvmDeclaredType type)
   {
-    boolean ignoreSupperInterfaces = type.getIdentifier().startsWith("$");
     JvmTypeReference result = null;
+    String identifier = type.getIdentifier();
+    boolean ignoreSupperInterfaces = identifier != null && identifier.startsWith("$");
     for (JvmTypeReference candidate: type.getSuperTypes())
     {
       JvmType jvmType = candidate.getType();
@@ -37,5 +38,4 @@ public class XcoreLogicalContainerAwareReentrantTypeResolver extends LogicalCont
     }
     return result;
   }
-
 }