Added invalid argument exception
Merge branch 'release/v0.0.7'