diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
index 3e045a31e613..583753df7ff9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
@@ -60,9 +60,10 @@ import java.util.regex.PatternSyntaxException;
 public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiReference> implements HintAction, HighPriorityAction {
   @NotNull
   private final T myElement;
+  @NotNull
   private final R myRef;
 
-  protected ImportClassFixBase(@NotNull T elem, R ref) {
+  protected ImportClassFixBase(@NotNull T elem, @NotNull R ref) {
     myElement = elem;
     myRef = ref;
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyAddImportAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyAddImportAction.java
index 39234db19695..015eb561b0cb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyAddImportAction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyAddImportAction.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author peter
  */
 public class GroovyAddImportAction extends ImportClassFixBase<GrReferenceElement, GrReferenceElement> {
-  public GroovyAddImportAction(GrReferenceElement ref) {
+  public GroovyAddImportAction(@NotNull GrReferenceElement ref) {
     super(ref, ref);
   }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxImportClassFix.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxImportClassFix.java
index 04abf3baa07f..701142d06331 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxImportClassFix.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxImportClassFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil;
 */
 abstract class JavaFxImportClassFix extends ImportClassFixBase<XmlTag, JavaFxTagNameReference> {
 
-  public JavaFxImportClassFix(JavaFxTagNameReference ref, XmlTag element) {
+  public JavaFxImportClassFix(@NotNull JavaFxTagNameReference ref, @NotNull XmlTag element) {
     super(element, ref);
   }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java
index ad8a88441e30..ad6ec1e0b99e 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java
@@ -78,7 +78,7 @@ public class JavaFxTagNameReference extends TagNameReference{
       return super.getVariants();
     }
     final XmlTag xmlTag = (XmlTag)element;
-    
+
     final List<XmlElementDescriptor>
       variants = TagNameReference.<XmlElementDescriptor>getTagNameVariants(xmlTag, Arrays.asList(xmlTag.knownNamespaces()), new ArrayList<String>(), Function.ID);
     final List<LookupElement> elements = new ArrayList<LookupElement>(variants.size());
@@ -95,12 +95,15 @@ public class JavaFxTagNameReference extends TagNameReference{
   public static class JavaFxUnresolvedTagRefsProvider extends UnresolvedReferenceQuickFixProvider<JavaFxTagNameReference> {
     @Override
     public void registerFixes(JavaFxTagNameReference ref, QuickFixActionRegistrar registrar) {
-      registrar.register(new JavaFxImportClassFix(ref, ref.getTagElement()) {
-        @Override
-        protected XmlTag getTagElement(JavaFxTagNameReference ref) {
-          return ref.getTagElement();
-        }
-      });
+      XmlTag element = ref.getTagElement();
+      if (element != null) {
+        registrar.register(new JavaFxImportClassFix(ref, element) {
+          @Override
+          protected XmlTag getTagElement(JavaFxTagNameReference ref) {
+            return ref.getTagElement();
+          }
+        });
+      }
     }
 
     @NotNull
@@ -112,7 +115,7 @@ public class JavaFxTagNameReference extends TagNameReference{
 
   private static class JavaFxTagInsertHandler extends XmlTagInsertHandler {
     public static final JavaFxTagInsertHandler INSTANCE = new JavaFxTagInsertHandler();
-    
+
     @Override
     public void handleInsert(InsertionContext context, LookupElement item) {
       super.handleInsert(context, item);