Modified throttle error and some other tweaks.