Provide better recovery on connection failures