KRACOEUS-8246: null pointer fix