Merge pull request #15676 from artfulrobot/handle-exceptions-from-payment-processors