Only create new payment if there is none.
Merge pull request #1713 from kayue/patch-22

Only create new payment if there is none.