SONAR-4383 Improve messages