more consistent handling of timeouts