Better connection retry handling #44