Added some validation code.