Fix a possible NPE