Fix NRE in the previous commit