Added some (rather poor) error handling to the datafetcher