Error validation
Merge pull request #1 from Benjatorix/Adams-v1.1

Error validation