Don't unnecessarily wrap RuntimeExceptions

(and IllegalArgumentException is a RuntimeException now)

Change-Id: Ic18f11ff7675878c7f6b5e9ee52453bbb9f1e787