more throwing fixes