- Try and fix registry NPE when substitution is active.