Avoid another possible NPE