Added AddressNotFoundException catch