diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja
index 0dbe0f294..487cdf781 100644
--- a/salt/vars/globals.map.jinja
+++ b/salt/vars/globals.map.jinja
@@ -20,8 +20,8 @@
     'pipeline': INIT.PILLAR.global.pipeline,
     'so_version': INIT.PILLAR.global.soversion,
     'url_base': INIT.PILLAR.global.url_base,
-    'so_model': INIT.GRAINS.sosmodel,
-    'description': INIT.PILLAR.sensoroni.node_description,
+    'so_model': INIT.GRAINS.get('sosmodel',''),
+    'description': INIT.PILLAR.sensoroni.get('node_description',''),
     'docker_range': INIT.PILLAR.docker.range,
     'sensoroni_key': INIT.PILLAR.sensoroni.sensoronikey,
     'application_urls': {},