Fixed: problems on exit with --help or --version.