CLI Console Exception restructure