CLI Dispatcher Exception restructure