[TIMOB-13279] Cleaned up some error messages
Merge pull request #139 from bryan-m-hughes/timob-13279

[TIMOB-13279] Cleaned up some error messages