Assets Exception restructure