Fixed server null pointers