refactor(fetcher): improve error handling and code structure