Merge pull request #15370 from cpuguy83/better_error_on_client_connect

Better/more specific error messages on connect