Should we add this in the `error` handler for `entry` as well?