diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
index 2cfeba9795d..6909fa61d92 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
@@ -96,7 +96,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
                 .findAll(BuildScriptClasspathData.KEY)
                 .firstOrNull()
                 ?.data
-                ?.let { findKotlinPluginVersion(it) } ?: return null
+                ?.let { findKotlinPluginVersion(it) }// ?: return null TODO: Fix in CLion or our plugin KT-27623
 
             val platformKind = IdePlatformKindTooling.getTooling(kotlinSourceSet.platform).kind
             val platform = when (platformKind) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index a92aaed96ff..9e53687d199 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -143,7 +143,7 @@ fun Module.getOrCreateFacet(
 }
 
 fun KotlinFacet.configureFacet(
-    compilerVersion: String,
+    compilerVersion: String?,
     coroutineSupport: LanguageFeature.State,
     platform: IdePlatform<*, *>?, // if null, detect by module dependencies
     modelsProvider: IdeModifiableModelsProvider