[Subversion] Try and fix NREs caused by lib loading.