Update to handle empty client data files