Added some checking for empty server list