Merge \"Add a few more pending exception checks\"
am: 6aa9fafbfb

Change-Id: I4cb2c27c2e0618ad874fcd58b8057b8a26e9e090