updated error message processing
Merge pull request #24 from der2127/chad_cleanup

updated error message processing