LPS-48160 Improve messages