more strict timeout checking based on feedback on #8739