Make checkout a little bit more elegant: 1 line shorter and remove intermediate variable which name collides with the new error primitives for serialization