Avoided a LOT of NPE's