correcting a potential NPE
not returning null