Fixed ExceptionSet behavior