Keep retrying for client connection as well

Currently being used internally on the tokaido-bootstrap zip bundled but failed to make changes officially.

Fixes problem manifested in #1