fix the Exceptions