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

* commit '325a57218e9f13cf696215006c230cac34b3c8a1':
  Properly describe exception