diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CliJetFilesProvider.java b/compiler/cli/src/org/jetbrains/jet/compiler/CliJetFilesProvider.java
index a5ece0cdf01..1f12638e804 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/CliJetFilesProvider.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/CliJetFilesProvider.java
@@ -50,9 +50,12 @@ public class CliJetFilesProvider extends JetFilesProvider {
     @Override
     public List<JetFile> allInScope(GlobalSearchScope scope) {
         List<JetFile> answer = new ArrayList<JetFile>();
-        for (JetFile file : environment.getSession().getSourceFiles()) {
-            if (scope.contains(file.getVirtualFile())) {
-                answer.add(file);
+        CompileSession session = environment.getSession();
+        if(session != null) {
+            for (JetFile file : session.getSourceFiles()) {
+                if (scope.contains(file.getVirtualFile())) {
+                    answer.add(file);
+                }
             }
         }
         return answer;