Possible NPE fix