Invalid passed arguments should be catchable, not fatal

Bug: 60985
Change-Id: I049858154dfff90bd3edcc8909aa52459b60c370
(cherry picked from commit 8530a36952a8e25f8ca2d9b5bb90e9a385a2e240)