diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
index 79b0fa5c36e..a4d77ec5082 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
@@ -424,7 +424,7 @@ public class AsmUtil {
         v.athrow();
     }
 
-    public static void genClosureFields(CalculatedClosure closure, ClassBuilder v, KotlinTypeMapper typeMapper) {
+    public static void genClosureFields(@NotNull CalculatedClosure closure, ClassBuilder v, KotlinTypeMapper typeMapper) {
         List<Pair<String, Type>> allFields = new ArrayList<Pair<String, Type>>();
 
         ClassifierDescriptor captureThis = closure.getCaptureThis();
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
index 0a3ac13d535..d7b5fc66c8b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
@@ -47,7 +47,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
     private final OwnerKind contextKind;
     private final CodegenContext parentContext;
     private final ClassDescriptor thisDescriptor;
-    public final MutableClosure closure;
+    @Nullable public final MutableClosure closure;
     private final LocalLookup enclosingLocalLookup;
     private final NullableLazyValue<StackValue.Field> outerExpression;