Better error messages for broker catalog failures.

[Finishes #55671664]