Handle connection timeout #29