native-fetcher: save some work, fix timeout in error path