Fixed handling when there are no addresses.