Make sure billing & shipping address exist (fixes #901)