PR/395: Avoid infinite loop in oomem cleanup.
PR/395: fix typo