Double check empty data set in case of cleanup

Relates @287
[STORM] Check number of entries triggering a flush