changed events to detect whether eventdata is null