Fixes bug with exception being thrown for new events.