More CLI exception handling