removed the npe check