Make sure billing address is set, even if it isn't entered.
Fixes #247