- Add better 404 error handling when 404 was result of an API call