Import InvalidArgumentException
Merge branch 'hotfix/import-exceptions'

Close #4