diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
index c1b722ef01b..de57fe9e566 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
@@ -674,7 +674,7 @@ public class JetFlowInformationProvider {
                                     }
                                     else if (owner instanceof JetPrimaryConstructor) {
                                         if (!((JetParameter) element).hasValOrVar() &&
-                                            !((JetPrimaryConstructor) owner).getContainingClass().isAnnotation()) {
+                                            !((JetPrimaryConstructor) owner).getContainingClassOrObject().isAnnotation()) {
                                             report(Errors.UNUSED_PARAMETER.on((JetParameter) element, variableDescriptor), ctxt);
                                         }
                                     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.kt
index d14d7e40577..dd914c11797 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.kt
@@ -59,8 +59,6 @@ public open class JetClass : JetClassOrObject {
 
     public fun getProperties(): List<JetProperty> = getBody()?.getProperties().orEmpty()
 
-    public fun isAnnotation(): Boolean = hasModifier(JetTokens.ANNOTATION_KEYWORD)
-
     public fun isInterface(): Boolean =
         getStub()?.isInterface()
         ?: (findChildByType<PsiElement>(JetTokens.TRAIT_KEYWORD) != null || findChildByType<PsiElement>(JetTokens.INTERFACE_KEYWORD) != null)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
index bf4f3be8ca2..2420af7487f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
@@ -60,4 +60,6 @@ abstract public class JetClassOrObject : JetTypeParameterListOwnerStub<KotlinCla
     private fun hasSecondaryConstructors(): Boolean = !getSecondaryConstructors().isEmpty()
 
     public fun getSecondaryConstructors(): List<JetSecondaryConstructor> = getBody()?.getSecondaryConstructors().orEmpty()
+
+    public fun isAnnotation(): Boolean = hasModifier(JetTokens.ANNOTATION_KEYWORD)
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java
index afa4d338a2f..afbc0541b03 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java
@@ -63,7 +63,7 @@ public final class JetNamedDeclarationUtil {
             return getFQName((JetNamedDeclaration) parent);
         }
         else if (namedDeclaration instanceof JetParameter) {
-            JetClass constructorClass = JetPsiUtil.getClassIfParameterIsProperty((JetParameter) namedDeclaration);
+            JetClassOrObject constructorClass = JetPsiUtil.getClassIfParameterIsProperty((JetParameter) namedDeclaration);
             if (constructorClass != null) {
                 return getFQName(constructorClass);
             }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.java
index a75cb3afb13..2ebe7ee92dd 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.java
@@ -71,17 +71,9 @@ public class JetPrimaryConstructor extends JetDeclarationStub<KotlinPlaceHolderS
         }
     }
 
-    @Nullable
-    public JetClass getContainingClassOrNull() {
-        JetClassOrObject classOrObject = (JetClassOrObject) getParent();
-        return classOrObject instanceof JetClass ? (JetClass) classOrObject : null;
-    }
-
     @NotNull
-    public JetClass getContainingClass() {
-        JetClass classOrNull = getContainingClassOrNull();
-        assert classOrNull != null : "This method should be called when parent is JetClass";
-        return classOrNull;
+    public JetClassOrObject getContainingClassOrObject() {
+        return (JetClassOrObject) getParent();
     }
 
     public boolean hasConstructorKeyword() {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
index 33b40b799d9..bd15d2d2003 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
@@ -447,11 +447,11 @@ public class JetPsiUtil {
     }
 
     @Nullable
-    public static JetClass getClassIfParameterIsProperty(@NotNull JetParameter jetParameter) {
+    public static JetClassOrObject getClassIfParameterIsProperty(@NotNull JetParameter jetParameter) {
         if (jetParameter.hasValOrVar()) {
             PsiElement grandParent = jetParameter.getParent().getParent();
             if (grandParent instanceof JetPrimaryConstructor) {
-                return ((JetPrimaryConstructor) grandParent).getContainingClassOrNull();
+                return ((JetPrimaryConstructor) grandParent).getContainingClassOrObject();
             }
         }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
index c70176375b0..321710c6773 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
@@ -143,7 +143,7 @@ public class LazyDeclarationResolver {
             public DeclarationDescriptor visitParameter(@NotNull JetParameter parameter, Void data) {
                 PsiElement grandFather = parameter.getParent().getParent();
                 if (grandFather instanceof JetPrimaryConstructor) {
-                    JetClass jetClass = ((JetPrimaryConstructor) grandFather).getContainingClass();
+                    JetClassOrObject jetClass = ((JetPrimaryConstructor) grandFather).getContainingClassOrObject();
                     // This is a primary constructor parameter
                     ClassDescriptor classDescriptor = getClassDescriptor(jetClass);
                     if (parameter.hasValOrVar()) {
@@ -183,7 +183,7 @@ public class LazyDeclarationResolver {
 
             @Override
             public DeclarationDescriptor visitPrimaryConstructor(@NotNull JetPrimaryConstructor constructor, Void data) {
-                JetClass klass = constructor.getContainingClass();
+                JetClassOrObject klass = constructor.getContainingClassOrObject();
                 getClassDescriptor(klass).getConstructors();
                 return getBindingContext().get(BindingContext.CONSTRUCTOR, klass);
             }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
index e994a6085d4..ba6b640c584 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
@@ -234,7 +234,7 @@ public class LightClassUtil {
     @Nullable
     private static PsiClass getWrappingClass(@NotNull JetDeclaration declaration) {
         if (declaration instanceof JetParameter) {
-            JetClass constructorClass = JetPsiUtil.getClassIfParameterIsProperty((JetParameter) declaration);
+            JetClassOrObject constructorClass = JetPsiUtil.getClassIfParameterIsProperty((JetParameter) declaration);
             if (constructorClass != null) {
                 return getPsiClass(constructorClass);
             }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
index 6b50884a56d..5127c9c329e 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
@@ -77,7 +77,7 @@ public fun JetParameter.toPsiParameter(): PsiParameter? {
     val method: PsiMethod? = when (owner) {
         is JetFunction -> LightClassUtil.getLightClassMethod(owner)
         is JetPropertyAccessor -> LightClassUtil.getLightClassAccessorMethod(owner)
-        is JetPrimaryConstructor -> LightClassUtil.getPsiClass(owner.getContainingClass())?.getConstructors()?.let { constructors ->
+        is JetPrimaryConstructor -> LightClassUtil.getPsiClass(owner.getContainingClassOrObject())?.getConstructors()?.let { constructors ->
             if (constructors.isNotEmpty()) constructors[0] else null
         }
         else -> null
diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
index b2ed1e535e8..d520216f507 100644
--- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
@@ -76,8 +76,8 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
                     is JetNamedFunction ->
                         addCorrespondingParameterDescriptor(getDescriptor(declaringElement, resolveSession) as FunctionDescriptor, parameter)
                     is JetPrimaryConstructor -> {
-                        val jetClass: JetClass = declaringElement.getContainingClass()
-                        val classDescriptor = getDescriptor(jetClass, resolveSession) as ClassDescriptor
+                        val jetClassOrObject: JetClassOrObject = declaringElement.getContainingClassOrObject()
+                        val classDescriptor = getDescriptor(jetClassOrObject, resolveSession) as ClassDescriptor
                         addCorrespondingParameterDescriptor(classDescriptor.getUnsubstitutedPrimaryConstructor(), parameter)
                     }
                     else ->  super.visitParameter(parameter)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
index bf66ad635de..cac9becaa31 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
@@ -40,7 +40,7 @@ public open class ChangeVisibilityModifierIntention protected constructor(
 //        val descriptor = element.resolveToDescriptor() as? DeclarationDescriptorWithVisibility ?: return null
         val bindingContext = element.analyze()
         var descriptor = (if (element is JetPrimaryConstructor) //TODO: temporary code
-            ((element.getParent() as JetClass).resolveToDescriptor() as ClassDescriptor).getUnsubstitutedPrimaryConstructor()
+            (element.getContainingClassOrObject().resolveToDescriptor() as ClassDescriptor).getUnsubstitutedPrimaryConstructor()
         else
             bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element]) as? DeclarationDescriptorWithVisibility ?: return null
         if (descriptor is ValueParameterDescriptor) {