diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
index c7fa933d694..0ffde0460ab 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
@@ -71,7 +71,10 @@ class NewKotlinActivityAction: AnAction(KotlinIcons.FILE) {
             private fun convertFiles(project: Project) {
                 if (javaFilesToKotlin != null) {
                     DumbService.getInstance(project).smartInvokeLater {
-                        JavaToKotlinAction.convertFiles(javaFilesToKotlin!!, project, false)
+                        val filesToConvert = javaFilesToKotlin!!.filter { it.isValid }
+                        if (filesToConvert.isNotEmpty()) {
+                            JavaToKotlinAction.convertFiles(filesToConvert, project, false)
+                        }
                         javaFilesToKotlin = null
                     }
                 }