2nd npe fix