Update event firing to check first if event type exists