From 6fb710250ebbf62f0b7178e5f75e30ce65e77143 Mon Sep 17 00:00:00 2001
From: Vitaly Tsaplin <vitaly@tsaplin.com>
Date: Sat, 19 Apr 2014 17:07:16 +0400
Subject: [PATCH] Fix error when dragging tree node over empty area

---
 .../substance/internal/ui/SubstanceTreeUI.java            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/substance/src/main/java/org/pushingpixels/substance/internal/ui/SubstanceTreeUI.java b/substance/src/main/java/org/pushingpixels/substance/internal/ui/SubstanceTreeUI.java
index 7334b85d..95bc5476 100644
--- a/substance/src/main/java/org/pushingpixels/substance/internal/ui/SubstanceTreeUI.java
+++ b/substance/src/main/java/org/pushingpixels/substance/internal/ui/SubstanceTreeUI.java
@@ -522,9 +522,11 @@ public void run() {
 							.getOldValue();
 					if (oldValue != null && oldValue.getPath() != null) {
 						TreePath oldDrop = oldValue.getPath();
-						Rectangle oldBounds = getPathBounds(tree, oldDrop);
-						tree.repaint(0, oldBounds.y, tree.getWidth(),
-								oldBounds.height);
+						if (oldDrop != null) {
+							Rectangle oldBounds = getPathBounds(tree, oldDrop);
+							tree.repaint(0, oldBounds.y, tree.getWidth(),
+									oldBounds.height);
+						}
 					}
 					JTree.DropLocation currLocation = tree.getDropLocation();
 					if (currLocation != null) {