error handling
Merge branch 'errorhandling'