am 1e66f25a: am 325a5721: Merge "Properly describe exception" into mnc-dev

* commit '1e66f25a167a0300152c953271df8aabeecdfcf2':
  Properly describe exception