diff --git a/res/core/messages.xml b/res/core/messages.xml
index 4044f6de6..9a207ad5f 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -22,9 +22,9 @@
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
-        <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ungültige Zielregion."</text>
-      <text locale="en">"$unit($unit) in $region($region): '$order($command)' - invalid target region."</text>
     </type>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ungültige Zielregion."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - invalid target region."</text>
   </message>
   
   <message name="missing_direction">
@@ -32,9 +32,9 @@
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
-        <text locale="de">"$unit($unit) in $region($region): '$order($command)' - keine Richtung angegeben."</text>
-      <text locale="en">"$unit($unit) in $region($region): '$order($command)' - no direction was specified."</text>
     </type>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - keine Richtung angegeben."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - no direction was specified."</text>
   </message>
   
   <message name="target_region_not_empty">
@@ -42,9 +42,9 @@
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
-        <text locale="de">"$unit($unit) in $region($region): '$order($command)' - In der Zielregion befinden sich noch Einheiten."</text>
-      <text locale="en">"$unit($unit) in $region($region): '$order($command)' - There are units in the target region."</text>
     </type>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - In der Zielregion befinden sich noch Einheiten."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - There are units in the target region."</text>
   </message>
   
   <message name="force_leave_ship" section="events">
diff --git a/src/buildno.h b/src/buildno.h
index 39668bfb9..3a7947aaa 100644
--- a/src/buildno.h
+++ b/src/buildno.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 8
-#define VERSION_BUILD 6
+#define VERSION_BUILD 7
diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index 86a49983a..e1e476cd6 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -1981,6 +1981,7 @@ static int parse_messages(xmlDocPtr doc)
         /* strings */
         xpath->node = node;
         result = xmlXPathEvalExpression(BAD_CAST "text", xpath);
+        assert(result->nodesetval->nodeNr>0);
         for (k = 0; k != result->nodesetval->nodeNr; ++k) {
             xmlNodePtr node = result->nodesetval->nodeTab[k];
             struct locale *lang;