Fix exception problem