Added some validation checks
Merge pull request #38 from lal-ace/development

Added some validation checks