Do not resolve nil server.dns_name
Add new ipaddresses hash for issue #343