Update for new throttle error and minor changes.