More NPE checks
More changes