Handle raptor stricter checks in serializing