diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java
index 015d26d3d42..0bd221eab61 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java
@@ -64,11 +64,13 @@ public class CachedBodiesResolveContext implements BodiesResolveContext {
         topDownAnalysisParameters = context.getTopDownAnalysisParameters();
     }
 
+    @NotNull
     @Override
     public StorageManager getStorageManager() {
         return topDownAnalysisParameters.getStorageManager();
     }
 
+    @NotNull
     @Override
     public ExceptionTracker getExceptionTracker() {
         return topDownAnalysisParameters.getExceptionTracker();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
index 0803ce6a119..812c408dc7a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
@@ -119,11 +119,13 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
         return packageFragments;
     }
 
+    @NotNull
     @Override
     public StorageManager getStorageManager() {
         return topDownAnalysisParameters.getStorageManager();
     }
 
+    @NotNull
     @Override
     public ExceptionTracker getExceptionTracker() {
         return topDownAnalysisParameters.getExceptionTracker();