983994: Fixing organization create with bad environment