added more robust address handling