fix error handling, change throttle check