Fix exception rest dispatch