diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListAnnotationChecker.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListAnnotationChecker.kt
new file mode 100644
index 000000000000..a663b9bd063f
--- /dev/null
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListAnnotationChecker.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.transformations.listenerList
+
+import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.psi.PsiWildcardType
+import org.jetbrains.plugins.groovy.annotator.checkers.CustomAnnotationChecker
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration
+
+class ListenerListAnnotationChecker : CustomAnnotationChecker() {
+
+  override fun checkApplicability(holder: AnnotationHolder, annotation: GrAnnotation): Boolean {
+    if (annotation.qualifiedName != listenerListFqn) return false
+    val modifierList = annotation.owner as? GrModifierList
+    val parent = modifierList?.parent as? GrVariableDeclaration
+    val field = parent?.variables?.singleOrNull() as? GrField ?: return true
+
+    when (field.getListenerType()) {
+      null -> holder.createErrorAnnotation(annotation, "@ListenerList field must have a generic Collection type")
+      is PsiWildcardType -> holder.createErrorAnnotation(annotation, "@ListenerList field with generic wildcards not supported")
+    }
+
+    return true
+  }
+}
\ No newline at end of file
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index ed5e5f1c65bc..46c173d67909 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -143,6 +143,7 @@
     <renameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.TraitRenameHelper"/>
 
     <astTransformationSupport implementation="org.jetbrains.plugins.groovy.transformations.listenerList.ListenerListTransformationSupport"/>
+    <customAnnotationChecker implementation="org.jetbrains.plugins.groovy.transformations.listenerList.ListenerListAnnotationChecker"/>
 
     <positionManagerDelegate implementation="org.jetbrains.plugins.groovy.gant.GantPositionManagerHelper"/>
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListTest.groovy
index 02cbe358ff5f..1c63b2ec5c17 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/transformations/listenerList/ListenerListTest.groovy
@@ -59,6 +59,22 @@ class Main {
     bean.fireSomeCoolStuffHappened(null);
   }
 }
+'''
+      checkHighlighting()
+    }
+  }
+
+  void 'test errors highlighting'() {
+    fixture.with {
+      configureByText '_.groovy', '''\
+import groovy.beans.ListenerList
+class Bean {
+  <error descr="@ListenerList field must have a generic Collection type">@ListenerList</error> Object notACollection
+  <error descr="@ListenerList field must have a generic Collection type">@ListenerList</error> List rawList
+  <error descr="@ListenerList field with generic wildcards not supported">@ListenerList</error> List<?> wildcardList
+  <error descr="@ListenerList field with generic wildcards not supported">@ListenerList</error> List<? extends Range> boundedList
+  @ListenerList List<Object> okList
+}
 '''
       checkHighlighting()
     }