Fix to account for current dataset being undefined as removing data from the current set could result in it being completely empty.
Fix to account for current dataset being undefined as removing data from the current set could result in it being completely empty.

samklr/metrilyx-2.0,samklr/metrilyx-2.0,samklr/metrilyx-2.0,samklr/metrilyx-2.0