Trying to fix updateBillingInfo error handling.