Update Client.go

Added some fault tolerance features