Fix failure on events without registration