[#4] More validations

[#4] More validations