#32 npe fix