Merge "Improved trust error messaging (2/2)" into nyc-dev