Ah, yes, good catch on the NPE!