Improve error message and presentation.

[#82272848]