diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index 119aed1c44d..f3acd32a6ca 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -93,7 +93,12 @@ class ResolverForProjectImpl<M : ModuleInfo>(
     private fun isCorrectModuleInfo(moduleInfo: M) = moduleInfo in allModules
 
     override fun resolverForModuleDescriptor(descriptor: ModuleDescriptor): ResolverForModule {
-        val computation = resolverByModuleDescriptor[descriptor] ?: return delegateResolver.resolverForModuleDescriptor(descriptor)
+        val computation = resolverByModuleDescriptor[descriptor] ?: run {
+            if (delegateResolver is EmptyResolverForProject<*>) {
+                throw IllegalStateException("$descriptor is not contained in resolver $name")
+            }
+            return delegateResolver.resolverForModuleDescriptor(descriptor)
+        }
         return computation()
     }