diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index 48c9d63aa059..365c5e66d6c1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -345,6 +345,7 @@ public class PsiImplUtil {
         if (annotationType instanceof PsiClass) {
           return findApplicableTarget((PsiClass)annotationType, types);
         }
+        if (annotationType == null) return null;
       }
     }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
index d06f12251a77..14486f7b4cad 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
@@ -166,6 +166,22 @@ class Test {
     @TA
     Collection<caret> c;
 }
+'''
+  } 
+
+  public void testUnresolvedAnnotatedQualifiedImport() {
+    myFixture.configureByText 'a.java', '''
+class Test {
+    @Nullable Collection<caret> c;
+}
+'''
+    importClass();
+    myFixture.checkResult '''import java.util.Collection;
+
+class Test {
+    @Nullable
+    Collection<caret> c;
+}
 '''
   }