diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DescriptorByIdSignatureFinderImpl.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DescriptorByIdSignatureFinderImpl.kt
index b19c053365d..0c205003e3a 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DescriptorByIdSignatureFinderImpl.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DescriptorByIdSignatureFinderImpl.kt
@@ -151,13 +151,7 @@ class DescriptorByIdSignatureFinderImpl(
         }
         val candidates = acc
 
-        return when (candidates.size) {
-            1 -> candidates.first()
-            else -> {
-                findDescriptorByHash(candidates, signature.id)
-                    ?: error("No descriptor found for $signature")
-            }
-        }
+        return candidates.singleOrNull() ?: findDescriptorByHash(candidates, signature.id)
     }
 
     private fun findDescriptorByHash(candidates: Collection<DeclarationDescriptor>, id: Long?): DeclarationDescriptor? =