diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
index bcb408900ba..0243e35a905 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManagerUtil;
 import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
@@ -128,7 +127,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclara
 
                 JetProperty property = QuickFixUtil.getParentElementOfType(diagnostic, JetProperty.class);
                 if (property != null) {
-                    BindingContext context = KotlinCacheManagerUtil.getDeclarationsBindingContext(property);
+                    BindingContext context = AnalyzerFacadeWithCache.analyzeFileWithCache((JetFile) property.getContainingFile()).getBindingContext();
                     JetType lowerBoundOfOverriddenPropertiesTypes = QuickFixUtil.findLowerBoundOfOverriddenCallablesReturnTypes(context, property);
 
                     PropertyDescriptor descriptor = (PropertyDescriptor) context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property);
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterObjectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/afterObjectInsideBody.kt
new file mode 100644
index 00000000000..ca18a2f71ec
--- /dev/null
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/afterObjectInsideBody.kt
@@ -0,0 +1,13 @@
+// "Change 'prop' type to 'Int'" "true"
+// ERROR: Null can not be a value of a non-null type Int
+trait Test<T> {
+    val prop : T
+}
+
+class Other {
+    fun doTest() {
+        val some = object: Test<Int> {
+            override val prop: Int = null
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt
new file mode 100644
index 00000000000..98530b8ef50
--- /dev/null
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt
@@ -0,0 +1,13 @@
+// "Change 'prop' type to 'Int'" "true"
+// ERROR: Null can not be a value of a non-null type Int
+trait Test<T> {
+    val prop : T
+}
+
+class Other {
+    fun doTest() {
+        val some = object: Test<Int> {
+            override val <caret>prop = null
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 7310ee3bd66..8ff76ff6135 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -1251,6 +1251,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt");
             }
             
+            @TestMetadata("beforeObjectInsideBody.kt")
+            public void testObjectInsideBody() throws Exception {
+                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt");
+            }
+            
             @TestMetadata("beforePropertyReturnTypeMismatchOnOverride.kt")
             public void testPropertyReturnTypeMismatchOnOverride() throws Exception {
                 doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt");