small npe fix