LPS-39391 Fine tuning error messages