Added better error handling for payment registration to maybe catch some ghosts