am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
  Clean up ExceptionOccurred.