Catch enotconn here.
Merge bug26338
stable to default