Get rig of EnvironmentError (#16705)
16 files changed