Added validations

Line is too long. [84/80]