Fix an NPE