Better error handling for fetcher