Added some exception validations