handle exceptions
Merge branch 'edewit-exception-handling'