Incremental progress, need to fix a few more null-pointer issues in Validation.