Fix random events sometimes returning null