Merge pull request #91 from dblevins/exception-message-improvements

Exception message improvements