Fix unintended ImportError for wrong subcommnad