Improved error- and exception-handling
Conflict resolved