#188 npe fix