Add validation delegate and manual check.

DTS pointed out this method of debugging. Right now this validates OK.