Two minor optimizations and an ENOMEM.

-Bryan