Report connection errors and retry connecting

Recommend looking at the "files changed" not commit-by-commit, I took a circuitous route to arrive.