Tag Exception restructure