From d03f830622cb074ee96b2fa8fb7e32bdd4d02823 Mon Sep 17 00:00:00 2001
From: David Sparer <sparerd@gmail.com>
Date: Sat, 14 Jan 2017 10:36:54 -0700
Subject: [PATCH] added null test for the composite click handler

---
 .../ClickHandlers/TreeNodeCompositeClickHandlerTests.cs  | 9 ++++++++-
 .../Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs  | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs
index ee80e8a55..d024bcebf 100644
--- a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs
+++ b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs
@@ -1,4 +1,5 @@
-using mRemoteNG.Connection;
+using System;
+using mRemoteNG.Connection;
 using mRemoteNG.Tree;
 using NSubstitute;
 using NUnit.Framework;
@@ -28,5 +29,11 @@ namespace mRemoteNGTests.Tree
             handler1.Received().Execute(_connectionInfo);
             handler2.Received().Execute(_connectionInfo);
         }
+
+        [Test]
+        public void ThrowWhenExecuteGivenNullArg()
+        {
+            Assert.Throws<ArgumentNullException>(() => _clickHandler.Execute(null));
+        }
     }
 }
\ No newline at end of file
diff --git a/mRemoteV1/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs
index 81581e30b..39c7a7c25 100644
--- a/mRemoteV1/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs
+++ b/mRemoteV1/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using mRemoteNG.Connection;
 
 
@@ -10,7 +11,8 @@ namespace mRemoteNG.Tree
 
         public void Execute(ConnectionInfo clickedNode)
         {
-            if (clickedNode == null) return;
+            if (clickedNode == null)
+                throw new ArgumentNullException(nameof(clickedNode));
             foreach (var handler in ClickHandlers)
             {
                 handler.Execute(clickedNode);