Simplified error handling of do_step as any error code can be returned by prepare_v2