Fix exception rest