Fixed an issue with serverId never being truly null (issue #5)