Merge "Catch rollback exceptions in API exception handling"