better error messages
Merge branch 'master' into feature/discounts2.0