diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java index 7e1c548f8c49..d96eac097f48 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java @@ -178,7 +178,9 @@ class DesignDropTargetListener implements DropTargetListener { public void dragExit(DropTargetEvent dte) { try { - myComponentTree.setDropTargetComponent(null); + if (myComponentTree != null) { + myComponentTree.setDropTargetComponent(null); + } myUseDragDelta = false; if (myDraggedComponentList != null) { cancelDrag();