diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
index 209e953e0..ba71e651f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
@@ -2,7 +2,7 @@ RED.editor.envVarList = (function() {
 
     var currentLocale = 'en-US';
     var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
-    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred','jsonata'];
 
     /**
      * Create env var edit interface
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index d82de0d1d..002dc099b 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -696,13 +696,19 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
 function prepareJSONataExpression(value,node) {
     var expr = jsonata(value);
     expr.assign('flowContext', function(val, store) {
-        return node.context().flow.get(val, store);
+        if (node) {
+            return node.context().flow.get(val, store);
+        }
+        return "";
     });
     expr.assign('globalContext', function(val, store) {
-        return node.context().global.get(val, store);
+        if (node) {
+            return node.context().global.get(val, store);
+        }
+        return "";
     });
     expr.assign('env', function(name) {
-        var val = getSetting(node, name, node._flow);
+        var val = getSetting(node, name, node ? node._flow : null);
         if (typeof val !== 'undefined') {
             return val;
         } else {