Improve error-messages for user
Simplify text