From 0741f4334b6299ef6678b686f1d63e151be8129a Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 2 Feb 2019 12:47:50 +0100
Subject: [PATCH] add null protection

---
 .../src/org/diylc/swing/plugins/statusbar/StatusBar.java        | 2 +-
 .../src/org/diylc/swing/plugins/tree/TreeGestureListener.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
index 2283da9e..af41cddb 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
@@ -461,7 +461,7 @@ public class StatusBar extends JPanel implements IPlugIn {
         statusText = "<html>Selection: " + builder.toString() + "</html>";
       }
     } else {
-      if (forceInstatiate)
+      if (forceInstatiate != null && forceInstatiate)
         statusText =  "<html>Drag the mouse over the canvas to place a new <font color='blue'>" + componentSlot.getName()
             + "</font></html>";
       else
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreeGestureListener.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreeGestureListener.java
index 852d9b3a..da283b69 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreeGestureListener.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreeGestureListener.java
@@ -51,7 +51,7 @@ class TreeGestureListener implements DragGestureListener {
     if (path != null && path.getLastPathComponent() instanceof DefaultMutableTreeNode) {
       DefaultMutableTreeNode leaf = (DefaultMutableTreeNode)path.getLastPathComponent();
       Payload payload = (Payload) leaf.getUserObject();
-      if (payload != null) {
+      if (payload != null && (payload.getComponentType() != null || payload.getClickListener() != null)) {
         if (payload.getComponentType() != null)
           presenter.setNewComponentTypeSlot(payload.getComponentType(), null, true);
         else