Adding more connection timeout checks