am ae36b4a8: Merge "Use specific exception class to abort transaction"

* commit 'ae36b4a8d05525c977af831f1b31126d84159e4f':
  Use specific exception class to abort transaction