DONT MERGE! Put more debug info
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt
index 5d99aa0..380e199 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt
@@ -59,7 +59,7 @@
             is IrTypeAliasSymbol -> generateTypeAlias(symbol)
             is IrTypeParameterSymbol -> generateTypeParameter(symbol)
             is IrFieldSymbol -> generateIrField(symbol)
-            else -> throw NotImplementedError("Generation of stubs for ${symbol::class.java} is not supported yet")
+            else -> throw NotImplementedError("Generation of stubs for ${symbol::class.java}:$symbol is not supported yet")
         }
     }
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
index f6a36b7..6a5edcd 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
@@ -96,9 +96,13 @@
             // the container after finishing visiting (i.e., on exit from `withRemoval***()`).
             declarationTransformer.withRemovalOfChildrenIn(directParentAsPackageFragment) {
                 for (declaration in declarationsWithSameParent) {
-                    declaration.transformVoid(declarationTransformer)
-                    declaration.transformVoid(expressionTransformer)
-                    declaration.transformVoid(nonLocalReturnsPatcher)
+                    try {
+                        declaration.transformVoid(declarationTransformer)
+                        declaration.transformVoid(expressionTransformer)
+                        declaration.transformVoid(nonLocalReturnsPatcher)
+                    } catch (n: NotImplementedError) {
+                        throw NotImplementedError("${n.message}\nIN\n${declaration.dump()}")
+                    }
                 }
             }
         }