adds more protection for payment exceptions