handle null descriptor case
Merge pull request #1653 from marcel-blonk/PLFM-2858

handle null descriptor case