More NPE checks