Check payment method should respond to cancel. Fixes #5307