LPS-43936 & LPS-43933 Improve messages