Improve exception message

Issue: SPR-12230