Make DragdropHandler more bulletproof
Merge pull request #2115 from danyaPostfactum/dragdropfix

Make DragdropHandler more bulletproof