Jeremy Sowden <jeremy@xxxxxxxxxx> wrote: > Currently, with only one base and dependency stored this is superfluous, > but it will become more useful when the next commit adds support for > storing a payload for every base. > + dep = payload_dependency_get(ctx, PROTO_BASE_NETWORK_HDR)->expr; This new helper can return NULL, would you mind reworking this to add error checks here? I've applied all patches up to this one.