Added validation of expression