Add event handler checks