1 files changed, 8 insertions, 3 deletions
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
index 78c5c2d8fdc8..fd38e3ddaf56 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
@@ -399,9 +399,14 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
 
   @Override
   public PsiElement getOriginalElement() {
-    PsiClass originalClass = (PsiClass)getContainingClass().getOriginalElement();
-    PsiField originalField = originalClass.findFieldByName(getName(), false);
-    return originalField != null ? originalField : this;
+    PsiClass containingClass = getContainingClass();
+    if (containingClass != null) {
+      PsiField originalField = ((PsiClass)containingClass.getOriginalElement()).findFieldByName(getName(), false);
+      if (originalField != null) {
+        return originalField;
+      }
+    }
+    return this;
   }
 
   @Override