Fixed issue with null ypdomainname being used.