minor NPE fixup