3912.   [bug]           Address some unrecoverable lookup failures. [RT #36330]

I went with a more conservative approach.  9.10.1b2 should be out in a couple of days.