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 4c39f093696..2b24f1ba1af 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
@@ -66,6 +66,18 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl
         return null;
     }
 
+    @Nullable
+    @Override
+    public JetTypeParameterList getTypeParameterList() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JetTypeConstraintList getTypeConstraintList() {
+        return null;
+    }
+
     @NotNull
     @Override
     public List<JetTypeConstraint> getTypeConstraints() {
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 aef9d5fd329..ad2587910a4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -145,6 +145,18 @@ public class JetParameter extends JetNamedDeclarationStub<KotlinParameterStub> i
         return null;
     }
 
+    @Nullable
+    @Override
+    public JetTypeParameterList getTypeParameterList() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JetTypeConstraintList getTypeConstraintList() {
+        return null;
+    }
+
     @NotNull
     @Override
     public List<JetTypeConstraint> getTypeConstraints() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
index 24c52812b87..756c3741915 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
@@ -17,10 +17,17 @@
 package org.jetbrains.jet.lang.psi;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 public interface JetTypeParameterListOwner extends JetNamedDeclaration {
+    @Nullable
+    JetTypeParameterList getTypeParameterList();
+
+    @Nullable
+    JetTypeConstraintList getTypeConstraintList();
+
     @NotNull
     List<JetTypeConstraint> getTypeConstraints();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java
index 8ff3175e25d..bb143fdc246 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerNotStubbed.java
@@ -31,13 +31,15 @@ abstract class JetTypeParameterListOwnerNotStubbed extends JetNamedDeclarationNo
         super(node);
     }
 
+    @Override
     @Nullable
-    JetTypeParameterList getTypeParameterList() {
+    public JetTypeParameterList getTypeParameterList() {
         return (JetTypeParameterList) findChildByType(JetNodeTypes.TYPE_PARAMETER_LIST);
     }
 
+    @Override
     @Nullable
-    JetTypeConstraintList getTypeConstraintList() {
+    public JetTypeConstraintList getTypeConstraintList() {
         return (JetTypeConstraintList) findChildByType(JetNodeTypes.TYPE_CONSTRAINT_LIST);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java
index 9e8d76b6448..5703d54da19 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwnerStub.java
@@ -35,11 +35,13 @@ abstract class JetTypeParameterListOwnerStub<T extends KotlinStubWithFqName> ext
         super(node);
     }
 
+    @Override
     @Nullable
     public JetTypeParameterList getTypeParameterList() {
         return getStubOrPsiChild(JetStubElementTypes.TYPE_PARAMETER_LIST);
     }
 
+    @Override
     @Nullable
     public JetTypeConstraintList getTypeConstraintList() {
         return getStubOrPsiChild(JetStubElementTypes.TYPE_CONSTRAINT_LIST);