Payment validations BOOK-673

See comments in commits.