CARROT-1072: follow-up fix for an NPE.