diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java
index fed0b16e503a..b09224f35704 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2016 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.DelegatingFix;
 import com.siyeh.ig.InspectionGadgetsFix;
+import com.siyeh.ig.psiutils.TypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -120,12 +121,16 @@ public class NullArgumentToVariableArgMethodInspection extends BaseInspection {
       }
       final PsiEllipsisType ellipsisType = (PsiEllipsisType)type1;
       final PsiType arrayType = ellipsisType.toArrayType();
+      final PsiType componentType = ellipsisType.getComponentType();
       if (checkArray) {
+        if (!componentType.equals(TypeUtils.getObjectType(call))) {
+          return;
+        }
         if (type.isAssignableFrom(arrayType) || !arrayType.isAssignableFrom(type)) {
           return;
         }
       }
-      registerError(lastArgument, lastArgument, ellipsisType.getComponentType(), arrayType);
+      registerError(lastArgument, lastArgument, componentType, arrayType);
     }
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/null_argument_to_variable_arg_method/NullArgumentToVariableArgMethod.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/null_argument_to_variable_arg_method/NullArgumentToVariableArgMethod.java
index 0c22ea0c4291..9ce1c00a972f 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/null_argument_to_variable_arg_method/NullArgumentToVariableArgMethod.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/null_argument_to_variable_arg_method/NullArgumentToVariableArgMethod.java
@@ -16,3 +16,13 @@ class CompletableFuture<T> {
         return null;
     }
 }
+class X {
+    void a() {
+        String[] array = {"one", "two"};
+        final String join = join(" ", array);
+    }
+
+    public static String join(CharSequence delimiter, CharSequence... elements) {
+        return "";
+    }
+}
\ No newline at end of file