Exceptions refactor but something is wrong with payment