Improve handling of empty source data