diff --git a/writefru.mako.hpp b/writefru.mako.hpp
index 7bbd079..e27005f 100755
--- a/writefru.mako.hpp
+++ b/writefru.mako.hpp
@@ -55,10 +55,13 @@
         % for name, value in properties.iteritems():
             % if fru and interface and name and value:
 <%
-                record, keyword = value.split(",")
+                record, keyword = name.split(",")
 %>\
-    ${intfName}Props["${name}"] =
-        vpdStore.get<Record::${record}, record::Keyword::${keyword}>();
+    if (vpdStore.exists<Record::${record}, record::Keyword::${keyword}>())
+    {
+        ${intfName}Props["${value}"] =
+            vpdStore.get<Record::${record}, record::Keyword::${keyword}>();
+    }
             % endif
         % endfor
     // Check and update extra properties