diff --git a/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java b/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
index 771eda4b1bd..ae2088312cb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
@@ -20,7 +20,7 @@ import com.intellij.lang.Language;
 import org.jetbrains.annotations.NotNull;
 
 public class KotlinLanguage extends Language {
-    public static final KotlinLanguage INSTANCE = new KotlinLanguage();
+    @NotNull public static final KotlinLanguage INSTANCE = new KotlinLanguage();
     public static final String NAME = "Kotlin";
 
     private KotlinLanguage() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
index 063119979a5..300a0f61c8a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
@@ -24,8 +24,9 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.formatter.FormatterUtil
 import com.intellij.psi.formatter.common.AbstractBlock
 import com.intellij.psi.tree.IElementType
-import org.jetbrains.kotlin.KtNodeTypes.*
-import org.jetbrains.kotlin.lexer.KtTokens.*
+import org.jetbrains.kotlin.KtNodeTypes.WHEN_ENTRY
+import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.lexer.KtTokens.ARROW
 
 /**
  * @see Block for good JavaDoc documentation
@@ -36,7 +37,7 @@ class KotlinBlock(
         private val myIndent: Indent?,
         wrap: Wrap?,
         mySettings: CodeStyleSettings,
-        private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)) {
+        private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)), BlockEx {
 
     private val kotlinDelegationBlock = object : KotlinCommonBlock(node, mySettings, mySpacingBuilder, myAlignmentStrategy) {
         override fun getNullAlignmentStrategy(): CommonAlignmentStrategy = NodeAlignmentStrategy.getNullStrategy()
@@ -91,6 +92,8 @@ class KotlinBlock(
     override fun getChildAttributes(newChildIndex: Int): ChildAttributes = kotlinDelegationBlock.getChildAttributes(newChildIndex)
 
     override fun isLeaf(): Boolean = kotlinDelegationBlock.isLeaf()
+
+    override fun getLanguage() = KotlinLanguage.INSTANCE
 }
 
 object KotlinSpacingBuilderUtilImpl : KotlinSpacingBuilderUtil {