Minor fix for possible NPE