diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt
index 1436a196080..690e56dc307 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt
@@ -64,10 +64,13 @@ class ScriptContentLoader(private val project: Project) {
         val scriptContents = getScriptContents(scriptDef, file)
         val result = scriptDef.dependencyResolver.resolve(
                 scriptContents,
-                (scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment ?: emptyMap()
+                getEnvironment(scriptDef)
         )
         ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
         return result.dependencies
     }
+
+    fun getEnvironment(scriptDef: KotlinScriptDefinition) =
+            (scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
 }
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
index e1122bc957c..de64302c37f 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
@@ -141,7 +141,7 @@ internal class ScriptDependenciesUpdater(
         val newJob = launch(scriptDependencyUpdatesDispatcher) {
             val result = dependenciesResolver.resolveAsync(
                     contentLoader.getScriptContents(scriptDef, file),
-                    (scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
+                    contentLoader.getEnvironment(scriptDef)
             )
             val lastTimeStamp = requests[path]?.request?.timeStamp
             val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp