Fixed serverAddress check