Merge "Handle errors within LogEvent" into rvc-dev