Fix possible NPE