Making API more fault tolerant