Merge "Add null check to getConfigForHostname"