Migrate from try-catch-fail to assertThrows

Change-Id: If5fb012270e8fac48bd2bdb2e2cb33ee5e785082
6 files changed