diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/ByDescriptorIndexer.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/ByDescriptorIndexer.kt
index 433d441f91b..b19ed065536 100644
--- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/ByDescriptorIndexer.kt
+++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/ByDescriptorIndexer.kt
@@ -61,13 +61,13 @@ object ByDescriptorIndexer {
         if (original is FakeCallableDescriptorForObject) {
             return getDeclarationForDescriptor(original.classDescriptor, file)
         }
-        
+
         if (original is MemberDescriptor) {
             val declarationContainer: KtDeclarationContainer? = when {
                 DescriptorUtils.isTopLevelDeclaration(original) -> file
                 original.containingDeclaration is ClassDescriptor ->
                     getDeclarationForDescriptor(original.containingDeclaration as ClassDescriptor, file) as? KtClassOrObject
-                else -> null
+                else -> error("Unexpected $original with container: ${original.containingDeclaration}")
             }
 
             if (declarationContainer != null) {
@@ -85,7 +85,7 @@ object ByDescriptorIndexer {
             }
         }
 
-        error("Should not be reachable")
+        error("Should not be reachable: $descriptor")
     }
 
     fun isSameCallable(