add possible NPE fix