CLSN-1449 Code review: Validation