Adds error messages
Merge branch 'master' of https://github.com/dmastylo/chat_client