Better handling of edge cases while throttling