Remove some undefined behaviour with client throttling.