diff --git a/data/syntax/d.xml b/data/syntax/d.xml
--- a/data/syntax/d.xml
+++ b/data/syntax/d.xml
@@ -101,7 +101,7 @@
    ========================================================================
 -->
 
-<language name="D" version="2" kateversion="5.0" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy (diggory.hardy@gmail.com), Aziz Köksal (aziz.koeksal@gmail.com), Jari-Matti Mäkelä (jmjm@iki.fi), Simon J Mackenzie (project.katedxml@smackoz.fastmail.fm)" license="LGPL">
+<language name="D" version="3" kateversion="5.0" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy (diggory.hardy@gmail.com), Aziz Köksal (aziz.koeksal@gmail.com), Jari-Matti Mäkelä (jmjm@iki.fi), Simon J Mackenzie (project.katedxml@smackoz.fastmail.fm)" license="LGPL">
   <highlighting>
     <!-- User-defined keywords (add identifiers you'd like highlighted here) -->
     <list name="userkeywords">
@@ -402,7 +402,7 @@
         <DetectChar char="." attribute="Normal Text" context="Properties"/>
 
         <!-- Look ahead for a digit and switch to NumberLiteral context if found. -->
-        <RegExpr context="NumberLiteral" String="\d" attribute="" lookAhead="true"/>
+        <RegExpr context="NumberLiteral" String="\d" attribute="Normal Text" lookAhead="true"/>
 
         <!-- #line Integer [Filespec] -->
         <StringDetect attribute="Pragma" context="LinePragma" String="#line"/>
diff --git a/data/syntax/puppet.xml b/data/syntax/puppet.xml
--- a/data/syntax/puppet.xml
+++ b/data/syntax/puppet.xml
@@ -27,7 +27,7 @@
   Boston, MA  02110-1301, USA.
 -->
 
-<language name="Puppet" section="Scripts" version="5" kateversion="3.8" extensions="*.pp" priority="10" mimetype="application/x-puppet" style="puppet" indenter="cstyle" author="Michal Humpula (michal.humpula@seznam.cz)" license="LGPLv2+">
+<language name="Puppet" section="Scripts" version="6" kateversion="3.8" extensions="*.pp" priority="10" mimetype="application/x-puppet" style="puppet" indenter="cstyle" author="Michal Humpula (michal.humpula@seznam.cz)" license="LGPLv2+">
   <highlighting>
     <list name="keywords">
       <item>import</item>
@@ -85,7 +85,7 @@
       </context>
 
       <!-- BEGIN Finders -->
-      <context name="FindString" attribute="" lineEndContext="#stay">
+      <context name="FindString" attribute="Normal Text" lineEndContext="#stay">
         <DetectChar attribute="String" char="'" context="string single"/>
         <DetectChar attribute="String" char="&quot;" context="string double"/>
       </context>
diff --git a/src/indexer/katehighlightingindexer.cpp b/src/indexer/katehighlightingindexer.cpp
--- a/src/indexer/katehighlightingindexer.cpp
+++ b/src/indexer/katehighlightingindexer.cpp
@@ -338,10 +338,13 @@
                     m_existingAttributeNames.insert(name);
                 }
             }
-        } else {
+        } else if (xml.attributes().hasAttribute(QLatin1String("attribute"))) {
             const QString name = xml.attributes().value(QLatin1String("attribute")).toString();
-            if (!name.isEmpty())
+            if (name.isEmpty()) {
+                qWarning() << m_filename << "specified attribute is empty:" << xml.name();
+            } else {
                 m_usedAttributeNames.insert(name);
+            }
         }
     }