Fix another cause of NRE's.