Fix No Client error