Refactor Error-handling