Fixes potentially deleting a null server id.