TIMOB-12504 More updating of error handling, fixed typo in event property.