Added void variable check for server-name variable.