Improve error messages sent to user, make them more clear
Improve error messages sent to user, make them more clear