Fix error thrown on missing event
Merge branch 'hotfix/events' into develop
Update the lock file