Do better checking for empty originator to prevent extra events from
getting created.