error handling
Merge pull request #2 from kkorte/master

Error handling