Improper validation fixed

@ dineshs91 Review and accept