diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java
index 87a725b9e7c..84cef9a9181 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java
@@ -17,12 +17,18 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 public interface JetCallableDeclaration extends JetNamedDeclaration, JetTypeParameterListOwner {
     @Nullable
     JetParameterList getValueParameterList();
 
+    @NotNull
+    List<JetParameter> getValueParameters();
+
     @Nullable
     JetTypeReference getReceiverTypeReference();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java
index 3a37b0479e9..9db554c7066 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java
@@ -26,6 +26,7 @@ public interface JetDeclarationWithBody extends JetDeclaration {
     @Nullable
     JetExpression getBodyExpression();
 
+    @Override
     @Nullable
     String getName();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
index 2b24f1ba1af..d0961f0ea01 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
@@ -60,6 +60,12 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl
         return null;
     }
 
+    @NotNull
+    @Override
+    public List<JetParameter> getValueParameters() {
+        return Collections.emptyList();
+    }
+
     @Nullable
     @Override
     public JetTypeReference getReceiverTypeReference() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
index ad2587910a4..52299e77a26 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -139,6 +139,12 @@ public class JetParameter extends JetNamedDeclarationStub<KotlinParameterStub> i
         return null;
     }
 
+    @NotNull
+    @Override
+    public List<JetParameter> getValueParameters() {
+        return Collections.emptyList();
+    }
+
     @Nullable
     @Override
     public JetTypeReference getReceiverTypeReference() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
index 2347da76a95..d8806517f59 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage;
 import org.jetbrains.jet.lexer.JetTokens;
 
+import java.util.Collections;
 import java.util.List;
 
 import static org.jetbrains.jet.JetNodeTypes.PROPERTY_DELEGATE;
@@ -86,6 +87,12 @@ public class JetProperty extends JetTypeParameterListOwnerStub<KotlinPropertyStu
         return null;
     }
 
+    @NotNull
+    @Override
+    public List<JetParameter> getValueParameters() {
+        return Collections.emptyList();
+    }
+
     @Override
     @Nullable
     public JetTypeReference getReceiverTypeReference() {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
index f987c97a9f4..f57f3cf7cee 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
@@ -86,7 +86,7 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact
                 if (resolvedCall != null) {
                     JetFunction declaration = getFunctionDeclaration(resolvedCall);
                     if (declaration != null) {
-                        JetParameter binaryOperatorParameter = declaration.getValueParameterList().getParameters().get(0);
+                        JetParameter binaryOperatorParameter = declaration.getValueParameters().get(0);
                         actions.add(new ChangeParameterTypeFix(binaryOperatorParameter, expressionType));
                     }
                 }