Added error checking for payment callback service and updated tests.