Add finalize before bailout