Add timeout checks