Adds checks for server