Merge "Detect when callers catch DB errors and fail to rollback"