More improvements to Client connect error handling