Correct bug: check null dataInfo BaseRepository