Make server more resilient to API errors