also adjusted the warning messages slightly so they make sense for both variants of event handlers fixes #9654