diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
index e79a90b14cd..435f2b405c7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
@@ -204,6 +204,12 @@ class AlternativeSignatureParsing {
 
     static List<TypeParameterDescriptor> computeAlternativeTypeParameters(List<TypeParameterDescriptor> typeParameterDescriptors,
             JetNamedFunction altFunDeclaration) throws AlternativeSignatureMismatchException {
+        if (typeParameterDescriptors.size() != altFunDeclaration.getTypeParameters().size()) {
+            throw new AlternativeSignatureMismatchException(
+                    String.format("Method signature has %d type parameters, but alternative signature has %d",
+                                  typeParameterDescriptors.size(), altFunDeclaration.getTypeParameters().size()));
+        }
+
         List<TypeParameterDescriptor> altParamDescriptors = new ArrayList<TypeParameterDescriptor>();
         for (int i = 0, size = typeParameterDescriptors.size(); i < size; i++) {
             TypeParameterDescriptor pd = typeParameterDescriptors.get(i);
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java
new file mode 100644
index 00000000000..ade3f30faf5
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java
@@ -0,0 +1,14 @@
+package test;
+
+import java.lang.UnsupportedOperationException;
+import java.util.*;
+import java.util.BitSet;
+import java.util.List;
+
+import jet.runtime.typeinfo.KotlinSignature;
+
+public class WrongTypeParametersCount {
+    @KotlinSignature("fun <A, B, C> foo(a : A, b : List<out B>)")
+    public <A, B> void foo(A a, List<? extends B> b) {
+    }
+}
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt
new file mode 100644
index 00000000000..f3009306e7d
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt
@@ -0,0 +1,8 @@
+package test
+
+import java.util.*
+
+public open class WrongTypeParametersCount : Object() {
+    public open fun <erased A, erased B> foo(p0 : A?, p1 : List<out B>?) {
+    }
+}
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.txt
new file mode 100644
index 00000000000..0a2850ab168
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -0,0 +1,6 @@
+namespace test
+
+public open class test.WrongTypeParametersCount : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.WrongTypeParametersCount
+    public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: java.util.List<out B>?): jet.Tuple0
+}