[NT] Improved task validation