Imran | BSHR-97 | add some validation