Fix null killing the server