Cleanup, and fetch error handling improvements.