Change to send proper error message when short of arguments.
Fix test.