Invalid passed arguments should be catchable, not fatal

Bug: 60985
Change-Id: I049858154dfff90bd3edcc8909aa52459b60c370