\Exception fixed to InvalidValueException
Merge branch 'hotfix-2.0.1' into develop