No longer seem to need throw_on_error