Better handling of case where host is not part of a domain.