Add error handling
Merge branch 'error_handling' #3