1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
index 19a493b75b..d8218da3ef 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
@@ -123,7 +123,12 @@ public class DynamicCodec implements ObjectCodec<Object> {
         serializeField(context, codedOut, arr, type.getComponentType(), base + scale * i);
       }
     } else {
-      context.serialize(UnsafeProvider.getInstance().getObject(obj, offset), codedOut);
+      try {
+        context.serialize(UnsafeProvider.getInstance().getObject(obj, offset), codedOut);
+      } catch (SerializationException.NoCodecException e) {
+        e.addTrail(this.type);
+        throw e;
+      }
     }
   }