added basic error handling, and prevented exit on error
simplify message
Merge branch 'errors'