Clarified some exception messages
Minor message string changes
Merge pull request #27 from bogdangrigg/2.0-reorg

Clarified some exception messages