LPS-33458 More descriptive messages