1.3/1.4 fix for internal server errors using cash/payment
Merge pull request #35 from einhverfr/master

1.3/1.4 fix for internal server errors using cash/payment