a touch better timeout handling (so the queue doesn't get deadlocked)