Replace the last of the ad-hoc RuntimeError exceptions