From b0d7e11d482378440600cba48557ed688f9cb988 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 9 Jul 2018 12:40:25 +0100
Subject: [PATCH] Fix evaluateNodeProperty handling of unknown types

---
 red/runtime/util.js           | 2 +-
 test/red/runtime/util_spec.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/red/runtime/util.js b/red/runtime/util.js
index 7ffe737b3..f4c0e1fa7 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -335,7 +335,7 @@ var parseContextStore = function(key) {
 }
 
 function evaluateNodeProperty(value, type, node, msg, callback) {
-    var result;
+    var result = value;
     if (type === 'str') {
         result = ""+value;
     } else if (type === 'num') {
diff --git a/test/red/runtime/util_spec.js b/test/red/runtime/util_spec.js
index 1b7438efd..f7bd3e950 100644
--- a/test/red/runtime/util_spec.js
+++ b/test/red/runtime/util_spec.js
@@ -307,6 +307,10 @@ describe("red/util", function() {
             },{});
             result.should.eql("123");
         });
+        it('returns null', function() {
+            var result = util.evaluateNodeProperty(null,'null');
+            (result === null).should.be.true();
+        })
         describe('environment variable', function() {
             before(function() {
                 process.env.NR_TEST_A = "foo";