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 b7f9d11a8f88..59d36dd23e3d 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
@@ -347,9 +347,10 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
   public PsiDocComment getDocComment(){
     CompositeElement treeElement = getNode();
     if (getTypeElement() != null) {
-      return (PsiDocComment)treeElement.findChildByRoleAsPsiElement(ChildRole.DOC_COMMENT);
+      PsiElement element = treeElement.findChildByRoleAsPsiElement(ChildRole.DOC_COMMENT);
+      return element instanceof PsiDocComment ? (PsiDocComment)element : null;
     }
-    else{
+    else {
       ASTNode prevField = treeElement.getTreePrev();
       while(prevField.getElementType() != JavaElementType.FIELD){
         prevField = prevField.getTreePrev();