Added a check for NULL that I missed when I switched from server pointers to ids