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

Add control to avoid NPE (see #10402) (rebased onto develop)