Better error handling for the datafetcher