Shipping address was unavailable when no shipping method was set (#985)