Fixed server to be persistent. No longer throws the null pointer