diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java
index 398fe898ac5..d68b8f57abe 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java
@@ -33,7 +33,9 @@ public class JetObjectInfo extends JetClassOrObjectInfo<JetObjectDeclaration> {
 
     protected JetObjectInfo(@NotNull JetObjectDeclaration element) {
         super(element);
-        this.kind = element.isClassObject() ? ClassKind.CLASS_OBJECT : ClassKind.OBJECT;
+        this.kind = element.isObjectLiteral()
+                    ? ClassKind.CLASS
+                    : (element.isClassObject() ? ClassKind.CLASS_OBJECT : ClassKind.OBJECT);
     }
 
     @Override
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index eb3bf3bd56e..6149224b45d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
@@ -273,7 +273,7 @@ public open class LazyClassMemberScope(
         if (GENERATE_CONSTRUCTORS_FOR.contains(thisDescriptor.getKind())) {
             val ownerInfo = declarationProvider.getOwnerInfo()
             val classOrObject = ownerInfo.getCorrespondingClassOrObject()
-            if (!thisDescriptor.getKind().isSingleton()) {
+            if (!thisDescriptor.getKind().isSingleton() && !classOrObject.isObjectLiteral()) {
                 assert(classOrObject is JetClass) { "No JetClass for $thisDescriptor" }
                 classOrObject as JetClass
                 val constructor = c.descriptorResolver.resolvePrimaryConstructorDescriptor(