Clean up command line exception handling