+ [OE-4087] handle event level errors correctly