Add a check that ignores null datasets