Add error handling to fetches