fix ugly error message when renaming an event
Merge branch 'testing' into develop
misc