More robust client connect