Improve handling of non-existing events.