This prevents the fields from potentially becoming inconsistent in case of errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>