Simplify error message, fixes #7851
Be more selective with highlghting clicks, fixes #7797