Further pre-1.6.2 compatibility fix
Catch last (hopefully) NPE when MVA resets world