am 22787ac1: am e343d613: Merge "Properly describe exception"

* commit '22787ac1a6d29213eda465c904587a583811f462':
  Properly describe exception