Refactoring: move Error-handling into the

respective directories, where they should be applied.