Move this exception handling up to the CLI interface