CLI Router Exception restructure