Added checks for active orgs.