Fix NPE from previous commit