Better fetcher error handling
Better source failure handling
Fixed folder support