Fixes 500 for any cancellation

Merged Wietse Kuipers requested to merge fix-event-cancel-500 into release/1.0.0

Merge request reports