diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
index 7ff5cf3f18c..0f095b87c2c 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
@@ -85,7 +85,7 @@ open class InliningContext(
 
     fun subInlineWithClassRegeneration(
             generator: NameGenerator,
-            newTypeMappings: MutableMap<String, String>,
+            newTypeMappings: MutableMap<String, String?>,
             callSiteInfo: InlineCallSiteInfo
     ): InliningContext = RegeneratedClassContext(
             this, expressionMap, state, generator, TypeRemapper.createFrom(typeRemapper, newTypeMappings),
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
index 2b1d142659f..efc9006a3ee 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
@@ -53,7 +53,7 @@ class MethodInliner(
     //keeps order
     private val transformations = ArrayList<TransformationInfo>()
     //current state
-    private val currentTypeMapping = HashMap<String, String>()
+    private val currentTypeMapping = HashMap<String, String?>()
     private val result = InlineResult.create()
     private var lambdasFinallyBlocks: Int = 0
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
index cf6fe1366e2..23969de4940 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
@@ -22,7 +22,7 @@ class TypeParameter(val oldName: String, val newName: String?, val isReified: Bo
 
 //typeMapping data could be changed outside through method processing
 class TypeRemapper private constructor(
-        private val typeMapping: MutableMap<String, String>,
+        private val typeMapping: MutableMap<String, String?>,
         val parent: TypeRemapper? = null,
         private val isRootInlineLambda: Boolean = false
 ) {
@@ -65,7 +65,7 @@ class TypeRemapper private constructor(
     companion object {
         @JvmStatic
         fun createRoot(formalTypeParameters: TypeParameterMappings?): TypeRemapper {
-            return TypeRemapper(HashMap<String, String>()).apply {
+            return TypeRemapper(HashMap<String, String?>()).apply {
                 formalTypeParameters?.forEach {
                     registerTypeParameter(it)
                 }
@@ -73,7 +73,7 @@ class TypeRemapper private constructor(
         }
 
         @JvmStatic
-        fun createFrom(mappings: MutableMap<String, String>): TypeRemapper {
+        fun createFrom(mappings: MutableMap<String, String?>): TypeRemapper {
             return TypeRemapper(mappings)
         }
 
@@ -83,7 +83,7 @@ class TypeRemapper private constructor(
             return TypeRemapper(createNewAndMerge(parentRemapper, mappings), parentRemapper, isRootInlineLambda)
         }
 
-        private fun createNewAndMerge(remapper: TypeRemapper, additionalTypeMappings: Map<String, String?>): MutableMap<String, String> {
+        private fun createNewAndMerge(remapper: TypeRemapper, additionalTypeMappings: Map<String, String?>): MutableMap<String, String?> {
             return HashMap(remapper.typeMapping).apply {
                 this += additionalTypeMappings
             }