Refactoring: moved all code concerned with error-handling in one package