diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt
index 757bec84dfc..ed3c0f8da57 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt
@@ -9,7 +9,8 @@ import java.io.File
 import java.net.URL
 
 fun findCompilerJar(classFromJarInTheSameLocation: Class<*>, kotlinHome: File): List<File> {
-    val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.parentFile ?: kotlinHome).takeIf { it.isDirectory }
+    val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.takeUnless { it.isDirectory }?.parentFile
+        ?: kotlinHome).takeIf { it.isDirectory }
         ?: return emptyList()
     val compilerJars = baseDir.listFiles { f: File ->
         COMPILER_JARS.any { expected ->