Merge "add null check for server HostName/Name/Flavor"