Added missing check on repopulating from data