Merge "Fix mistyped exceptions; InvalidArgumentException"