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