Check for multiple arguments, tweak error message, add test.

Change-Id: Ibf2637e04e2c0bb0e8c6f2dd58e9ddee82a5dba5