Martin Yde - #8394, Changed error handling on calendar events