error message updates
Merge pull request #321 from teharrison/develop

error message updates