diff --git a/platform/core-api/src/com/intellij/psi/stubs/StubSerializationHelper.java b/platform/core-api/src/com/intellij/psi/stubs/StubSerializationHelper.java
index bcf65ad79fc2..db52c572d1a8 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/StubSerializationHelper.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/StubSerializationHelper.java
@@ -150,7 +150,11 @@ public class StubSerializationHelper {
     final int id = DataInputOutputUtil.readINT(stream);
     final ObjectStubSerializer serializer = getClassById(id);
     if (serializer == null) {
-      throw new SerializerNotFoundException("No serializer registered for stub: ID=" + id + "; parent stub class=" + (parentStub != null? parentStub.getClass().getName() : "null"));
+      String externalId = null;
+      try {
+        externalId = myNameStorage.valueOf(id);
+      } catch (Throwable ignore) {}
+      throw new SerializerNotFoundException("No serializer registered for stub: ID=" + id + ", externalId:" + externalId + "; parent stub class=" + (parentStub != null? parentStub.getClass().getName() : "null"));
     }
 
     Stub stub = serializer.deserialize(stream, parentStub);