Now checking environment variable in the CLI code.