r9826: Add some more OOM checks