Fix exception-raising stuff.