diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index 125b02ba8fd..684d0a9c6e6 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
@@ -31,6 +31,7 @@ import com.intellij.openapi.fileTypes.PlainTextFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
@@ -198,6 +199,8 @@ public class JetCoreEnvironment {
                 configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY));
 
         project.registerService(VirtualFileFinder.class, new CliVirtualFileFinder(classPath));
+
+        project.registerService(PsiDocumentManager.class, new MockPsiDocumentManager());
     }
 
     public CompilerConfiguration getConfiguration() {
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
new file mode 100644
index 00000000000..bbb779135fc
--- /dev/null
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.cli.jvm.compiler;
+
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+
+// copied from com.intellij.mock.MockPsiDocumentManager
+public class MockPsiDocumentManager extends PsiDocumentManager {
+    @Override
+    @Nullable
+    public PsiFile getPsiFile(@NotNull Document document) {
+        throw new UnsupportedOperationException("Method getPsiFile is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    @Nullable
+    public PsiFile getCachedPsiFile(@NotNull Document document) {
+        throw new UnsupportedOperationException("Method getCachedPsiFile is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    @Nullable
+    public Document getDocument(@NotNull PsiFile file) {
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public Document getCachedDocument(@NotNull PsiFile file) {
+        VirtualFile vFile = file.getViewProvider().getVirtualFile();
+        return FileDocumentManager.getInstance().getCachedDocument(vFile);
+    }
+
+    @Override
+    public void commitAllDocuments() {
+    }
+
+    @Override
+    public void performForCommittedDocument(@NotNull final Document document, @NotNull final Runnable action) {
+        action.run();
+    }
+
+    @Override
+    public void commitDocument(@NotNull Document document) {
+    }
+
+    @Override
+    @NotNull
+    public Document[] getUncommittedDocuments() {
+        throw new UnsupportedOperationException("Method getUncommittedDocuments is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public boolean isUncommited(@NotNull Document document) {
+        throw new UnsupportedOperationException("Method isUncommited is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public boolean isCommitted(@NotNull Document document) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasUncommitedDocuments() {
+        throw new UnsupportedOperationException("Method hasUncommitedDocuments is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public void commitAndRunReadAction(@NotNull Runnable runnable) {
+        throw new UnsupportedOperationException("Method commitAndRunReadAction is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public <T> T commitAndRunReadAction(@NotNull Computable<T> computation) {
+        throw new UnsupportedOperationException("Method commitAndRunReadAction is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public void addListener(@NotNull Listener listener) {
+        throw new UnsupportedOperationException("Method addListener is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public void removeListener(@NotNull Listener listener) {
+        throw new UnsupportedOperationException("Method removeListener is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public boolean isDocumentBlockedByPsi(@NotNull Document doc) {
+        throw new UnsupportedOperationException("Method isDocumentBlockedByPsi is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public void doPostponedOperationsAndUnblockDocument(@NotNull Document doc) {
+        throw new UnsupportedOperationException(
+                "Method doPostponedOperationsAndUnblockDocument is not yet implemented in " + getClass().getName());
+    }
+
+    @Override
+    public boolean performWhenAllCommitted(@NotNull Runnable action) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void reparseFiles(@NotNull Collection<VirtualFile> files, boolean includeOpenFiles) {
+        throw new UnsupportedOperationException();
+    }
+}