diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt index 6364e8813db..043106cb0f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt @@ -134,7 +134,7 @@ private fun checkMemberClashing( .firstOrNull() { it.name == member.name } ?.let { val message = "${targetClassDescriptor.renderForConflicts()} " + - "already contains nested class named ${CommonRefactoringUtil.htmlEmphasize(member.name)}" + "already contains nested class named ${CommonRefactoringUtil.htmlEmphasize(member.name ?: "")}" conflicts.putValue(it, message.capitalize()) } }