create branch
merge bug25363 into bug25365
only invoke control_throttle when necesseary
small refactor
oops; put exception handling back in
Merge bug25365