Added validation in settings