No payment error when order has no payment

Follow up to 20b47028f786257c4283a33626a7d4111d9b9669
Merge branch 'master' into email-designs