Merge 25573 from trunk:
 - fix error output when dataset verify detects wrong data.