Fault tolerance and better JSON parsing