Add originator id to error events (#237)