Updated to throw invalidArguments correctly
Merge branch 'release/v0.0.9'