fixing non-destructive NPE
Merge pull request #1350 from jhulslander/KRACOEUS-8482-PDIP

fixing non-destructive NPE