adding checks to validation