From 6fd9399b20afa36e171b48f0128b649b379e848d Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Thu, 9 Feb 2017 16:45:23 +0000
Subject: [PATCH] CORPRIV-665: Protect against NPE

---
 .../src/main/kotlin/net/corda/demobench/ui/CloseableTab.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/ui/CloseableTab.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/ui/CloseableTab.kt
index f8590f0e99..145a5863c9 100644
--- a/tools/demobench/src/main/kotlin/net/corda/demobench/ui/CloseableTab.kt
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/ui/CloseableTab.kt
@@ -9,12 +9,12 @@ class CloseableTab(text: String, content: Node) : Tab(text, content) {
 
     fun requestClose() {
         val b = behaviour
-        if (b.canCloseTab(this)) {
+        if ((b != null) && b.canCloseTab(this)) {
             b.closeTab(this)
         }
     }
 
-    private val behaviour: TabPaneBehavior
-        get() = (tabPane.skin as TabPaneSkin).behavior
+    private val behaviour: TabPaneBehavior?
+        get() = (tabPane.skin as TabPaneSkin?)?.behavior
 
 }