added npe guard