Added some validations. Please.