Remove extra throwing
Migrate isupport handling to a foreach