From 00920712313e75ed67e58c2b3a2e8c6922a80d70 Mon Sep 17 00:00:00 2001
From: Konstantinos Chalkias <konstantinos.chalkias@r3.com>
Date: Tue, 6 Jun 2017 18:30:01 +0300
Subject: [PATCH] bug fix on null checking Corda.kt

---
 node/src/main/kotlin/net/corda/node/Corda.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/src/main/kotlin/net/corda/node/Corda.kt b/node/src/main/kotlin/net/corda/node/Corda.kt
index 175c5b7491..a8cf2bfc2c 100644
--- a/node/src/main/kotlin/net/corda/node/Corda.kt
+++ b/node/src/main/kotlin/net/corda/node/Corda.kt
@@ -166,7 +166,7 @@ fun main(args: Array<String>) {
         }
         node.run()
     } catch (e: Exception) {
-        if (e.message!!.startsWith("Unknown named curve:")) {
+        if (e.message?.startsWith("Unknown named curve:") ?: false) {
             log.error("Exception during node startup - ${e.message}. " +
                     "This is a known OpenJDK issue on some Linux distributions, please use OpenJDK from zulu.org or Oracle JDK.")
         } else