[NF] Add more validation (#18).