fix payment exceptions