Added validations

Line is too long. [91/80]