Fix a null error on the server