diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
index 91d9840ffc3..52016a5a8aa 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
@@ -37,6 +37,7 @@ import com.intellij.openapi.ui.ex.MessagesEx
 import org.jetbrains.jet.plugin.j2k.J2kPostProcessor
 import com.intellij.openapi.vfs.CharsetToolkit
 import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.jet.utils.addIfNotNull
 
 public class JavaToKotlinAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
@@ -116,10 +117,7 @@ public class JavaToKotlinAction : AnAction() {
         val result = ArrayList<VirtualFile>()
         for ((i, psiFile) in javaFiles.withIndices()) {
             ApplicationManager.getApplication().runWriteAction {
-                val file = saveConversionResult(psiFile.getVirtualFile(), convertedTexts[i], project)
-                if (file != null) {
-                    result.add(file)
-                }
+                result.addIfNotNull(saveConversionResult(psiFile.getVirtualFile(), convertedTexts[i], project))
             }
         }
         return result
diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
index a05d3344547..c02c87bad9f 100644
--- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
@@ -64,8 +64,7 @@ class Converter private(private val elementToConvert: PsiElement,
         }
     }
 
-    public fun withSpecialContext(context: PsiElement): Converter
-            = Converter(elementToConvert, settings, conversionScope, referenceSearcher, postProcessor, commonState, PersonalState(context))
+    public fun withSpecialContext(context: PsiElement): Converter = withState(PersonalState(context))
 
     private fun withState(state: PersonalState): Converter
             = Converter(elementToConvert, settings, conversionScope, referenceSearcher, postProcessor, commonState, state)