adding in null check to events page