Merge pull request #14 from gretchiemoran/master

PRD-3965 Adding validation and exception handling