More robust handling of cases where no data files