diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
index 0294e3bd6c0..af8bc39bf9b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
@@ -171,7 +171,7 @@ public class ResolveSession {
     }
 
     @NotNull
-    public JetScope getResolutionScope(PsiElement element) {
+    public JetScope getResolutionScope(@NotNull PsiElement element) {
         PsiElement parent = element.getParent();
         if (parent instanceof JetFile) {
             JetFile file = (JetFile) parent;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
index 1ee8fc80d8f..c0cde4c5711 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
@@ -217,7 +217,9 @@ public class ResolveSessionUtils {
 
     private static JetScope getExpressionResolutionScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
         JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(expression, JetDeclaration.class);
-        // DeclarationDescriptor descriptor = resolveToDescriptor(parentDeclaration);
+        if (parentDeclaration == null) {
+            return resolveSession.getResolutionScope(expression.getContainingFile().getFirstChild());
+        }
         return resolveSession.getResolutionScope(parentDeclaration);
     }