Retry when a connection error is received

Change-Id: I4aaf07a715b125d82a172ea927d3c97376d22d58