+cli commands
corrected exception names