Added retry if has connection error betwen server and client