diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
index a2d0fef9845..122c01b7ea0 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
@@ -169,16 +169,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
                 .register(javaClass<IncrementalCacheProvider>(), IncrementalCacheProviderImpl(incrementalCaches))
                 .build()
 
-        val environment = CompilerEnvironment.getEnvironmentFor(
+        return CompilerEnvironment.getEnvironmentFor(
                 PathUtil.getKotlinPathsForJpsPluginOrJpsTests(),
-                javaClass.getClassLoader(),
                 { className ->
-                    className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
+                    className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
                     || className == "org.jetbrains.jet.config.Services"
                 },
                 compilerServices
         )
-        return environment
     }
 
     private fun getOutputItemsAndTargets(