Add a few more pending exception checks

Bug: 28371539

Change-Id: Ibd2f7ccf7bd8cf7ef6c24534be1efbcc9b30014a
2 files changed