GUVNOR-2122: Fix NPE when pre-populating DMO for new trees