Fixed empty client generation.