NPE fix.
less objects, less garbage collection.