Populator-nullref fix