diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
index f64fc2571c0..daf74153397 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
@@ -35,6 +35,7 @@ private val messageParameterRegex = """\{\d.*?}""".toRegex()
 fun KtDiagnosticFactoryToRendererMap.verifyMessageForFactory(factory: AbstractKtDiagnosticFactory, property: KProperty<*>) = buildList {
     if (!containsKey(factory)) {
         add("No default diagnostic renderer is provided for ${property.name}")
+        return@buildList
     }
 
     val renderer = get(factory)!!