Fix freemarker distribution NPE, POR-2461