small tweaks. consolidating error handler for payment.