[65] Fix exception handling