#1916 - Initial pass at improving discount error messages