Gracefully handle more errors