Improve warning for out-of-data dataset