diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationProducer.kt
index fe1a6a157f8..71019266948 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationProducer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationProducer.kt
@@ -27,8 +27,8 @@ class KotlinStandaloneScriptRunConfigurationProducer :
         RunConfigurationProducer<KotlinStandaloneScriptRunConfiguration>(KotlinStandaloneScriptRunConfigurationType.instance) {
     override fun setupConfigurationFromContext(
             configuration: KotlinStandaloneScriptRunConfiguration,
-            context: ConfigurationContext?,
-            sourceElement: Ref<PsiElement>?
+            context: ConfigurationContext,
+            sourceElement: Ref<PsiElement>
     ): Boolean {
         configuration.setupFilePath(pathFromContext(context) ?: return false)
         configuration.setGeneratedName()
@@ -40,8 +40,8 @@ class KotlinStandaloneScriptRunConfigurationProducer :
         return pathFromPsiElement(location.psiElement)
     }
 
-    override fun isConfigurationFromContext(configuration: KotlinStandaloneScriptRunConfiguration?, context: ConfigurationContext?): Boolean {
-        val filePath = configuration?.filePath
+    override fun isConfigurationFromContext(configuration: KotlinStandaloneScriptRunConfiguration, context: ConfigurationContext): Boolean {
+        val filePath = configuration.filePath
         return filePath != null && filePath == pathFromContext(context)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
index 1c0e11b6265..1e0128371ba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
@@ -180,7 +180,7 @@ class KotlinAddImportAction internal constructor(
                         return "Exclude '$value' from auto-import"
                     }
 
-                    override fun onChosen(selectedValue: String?, finalChoice: Boolean): PopupStep<Any>? {
+                    override fun onChosen(selectedValue: String, finalChoice: Boolean): PopupStep<Any>? {
                         if (finalChoice && !project.isDisposed) {
                             AddImportAction.excludeFromImport(project, selectedValue)
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
index 8cfca9b0667..2e36a87ee65 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
@@ -85,7 +85,7 @@ class ReplaceExplicitFunctionLiteralParamWithItIntention : PsiElementBaseIntenti
         val functionLiteral: KtFunctionLiteral,
         val cursorWasInParameterList: Boolean
     ) : RenameProcessor(
-        editor.project,
+        editor.project!!,
         functionLiteral.valueParameters.single(),
         "it",
         false,