adding npe checks