Added Server checking