diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
index e066fdfa3f8..f76eaf973ee 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.codegen.context;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -24,17 +26,15 @@ import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
 public class AnonymousClassContext extends CodegenContext {
     public AnonymousClassContext(
-            JetTypeMapper typeMapper,
-            ClassDescriptor contextDescriptor,
-            OwnerKind contextKind,
-            CodegenContext parentContext,
-            LocalLookup localLookup
+            @NotNull JetTypeMapper typeMapper,
+            @NotNull ClassDescriptor contextDescriptor,
+            @NotNull OwnerKind contextKind,
+            @Nullable CodegenContext parentContext,
+            @Nullable LocalLookup localLookup
     ) {
         //noinspection SuspiciousMethodCalls
-        super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE,
-                                                                                                                 contextDescriptor),
-              contextDescriptor,
-              localLookup);
+        super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, contextDescriptor),
+              contextDescriptor, localLookup);
         initOuterExpression(typeMapper, contextDescriptor);
     }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
index 457366cace2..2dac8bb2e83 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.codegen.context;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -24,17 +26,15 @@ import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
 public class ClassContext extends CodegenContext {
     public ClassContext(
-            JetTypeMapper typeMapper,
-            ClassDescriptor contextDescriptor,
-            OwnerKind contextKind,
-            CodegenContext parentContext,
-            LocalLookup localLookup
+            @NotNull JetTypeMapper typeMapper,
+            @NotNull ClassDescriptor contextDescriptor,
+            @NotNull OwnerKind contextKind,
+            @Nullable CodegenContext parentContext,
+            @Nullable LocalLookup localLookup
     ) {
         //noinspection SuspiciousMethodCalls
-        super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE,
-                                                                                                                 contextDescriptor),
-              contextDescriptor,
-              localLookup);
+        super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, contextDescriptor),
+              contextDescriptor, localLookup);
         initOuterExpression(typeMapper, contextDescriptor);
     }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
index a6444ef3558..6e25af7cb63 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -29,11 +30,11 @@ class ClosureContext extends CodegenContext {
     private final ClassDescriptor classDescriptor;
 
     public ClosureContext(
-            JetTypeMapper typeMapper,
-            FunctionDescriptor contextDescriptor,
-            ClassDescriptor classDescriptor,
-            CodegenContext parentContext,
-            LocalLookup localLookup
+            @NotNull JetTypeMapper typeMapper,
+            @NotNull FunctionDescriptor contextDescriptor,
+            @NotNull ClassDescriptor classDescriptor,
+            @Nullable CodegenContext parentContext,
+            @Nullable LocalLookup localLookup
     ) {
         //noinspection SuspiciousMethodCalls
         super(contextDescriptor, OwnerKind.IMPLEMENTATION, parentContext,
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
index 449931cd78d..62162202bfc 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -29,8 +28,8 @@ public class ConstructorContext extends MethodContext {
     private static final StackValue local1 = StackValue.local(1, OBJECT_TYPE);
 
     public ConstructorContext(
-            ConstructorDescriptor contextDescriptor,
-            OwnerKind kind,
+            @NotNull ConstructorDescriptor contextDescriptor,
+            @NotNull OwnerKind kind,
             @NotNull CodegenContext parent
     ) {
         super(contextDescriptor, kind, parent);
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
index 1f867415ea0..6451c386573 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
@@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
 public class MethodContext extends CodegenContext {
     public MethodContext(
             @NotNull FunctionDescriptor contextType,
-            OwnerKind contextKind,
-            CodegenContext parentContext
+            @NotNull OwnerKind contextKind,
+            @NotNull CodegenContext parentContext
     ) {
         super(contextType instanceof PropertyAccessorDescriptor
               ? ((PropertyAccessorDescriptor) contextType).getCorrespondingProperty()
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java
index cff6c9e8046..cf4e893f093 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java
@@ -17,11 +17,12 @@
 package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 
 public class NamespaceContext extends CodegenContext {
-    public NamespaceContext(@NotNull NamespaceDescriptor contextDescriptor, CodegenContext parent, @NotNull OwnerKind kind) {
+    public NamespaceContext(@NotNull NamespaceDescriptor contextDescriptor, @Nullable CodegenContext parent, @NotNull OwnerKind kind) {
         super(contextDescriptor, kind, parent, null, null, null);
     }