Important emergency fix!!!
Avoid assert when no data set