More planter NPE fixes