fix_exceptions.diff
