yet more NPE checks