am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit '977c4a5b81317cdf6537e58f82a5edcd0641ca50':
  Clean up ExceptionOccurred.