Improving the discount error notices

#1916 - This was branched a while ago, but here's a fresh PR with refreshed patch. Submitted for your testing @pippinsplugins ;)