Fault tolerance - added for HTTP calls