improve robustness in data-source
improve robustness in data-source

cardstack/cardstack,courajs/cardstack,cardstack/cardstack,cardstack/cardstack,cardstack/cardstack,courajs/cardstack,courajs/cardstack,cardstack/cardstack,cardstack/cardstack