Began correcting exception handling regressions.

While a number of outstanding regressions remain to be corrected, we're well on
our well-worn way to reasonable health in the heath of bugs.