[Version Control] Better fix for NRE.