Another fix for exceptions.