Minor NPE fix