Add control to avoid NPE (see #10402)
Merge pull request #868 from jburel/dnd

Add control to avoid NPE (see #10402)