diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
index 238aa5cf1b9..a4dbd742ef7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
@@ -89,7 +89,7 @@ class JavaToKotlinAction : AnAction() {
                     }
                 }
                 catch (e: IOException) {
-                    MessagesEx.error(psiFile.project, e.message).showLater()
+                    MessagesEx.error(psiFile.project, e.message ?: "").showLater()
                 }
             }
             return result
@@ -138,6 +138,8 @@ class JavaToKotlinAction : AnAction() {
 
                 externalCodeUpdate?.invoke()
 
+                PsiDocumentManager.getInstance(project).commitAllDocuments()
+
                 newFiles.singleOrNull()?.let {
                     FileEditorManager.getInstance(project).openFile(it, true)
                 }