Updated check for noData