Bug fix, multiple expections from pipeline

Forgot to change this. It would throw a NoSuchElementException if
the timeout handler had already been removed.