It's possible that we could test the internal request_handlers data structure after the exception, but BEFORE it has been modified. Just wait for it to go to zero length. Change-Id: I364b1f347553a3f6710a516461c4f097d0276794