refactoring error-handling
more refactoring errorhandling
dont burg the build