diff --git a/data/tools/wesnoth/wmlparser2.py b/data/tools/wesnoth/wmlparser2.py
index 74a014bc5b60..c4fe5cce09c0 100755
--- a/data/tools/wesnoth/wmlparser2.py
+++ b/data/tools/wesnoth/wmlparser2.py
@@ -261,8 +261,10 @@ def preprocess(self, defines):
         self.preprocessed = output + "/" + os.path.basename(self.path) +\
             ".plain"
         if not os.path.exists(self.preprocessed):
+            first_line = open(self.path).readline().strip()
             raise WMLError(self, "Preprocessor error:\n" +
                 " ".join(commandline) + "\n" +
+                "First line: " + first_line + "\n" +
                 out +
                 err)
 
diff --git a/data/tools/wmlunits b/data/tools/wmlunits
index b3db3455a897..d1f9e750bc99 100755
--- a/data/tools/wmlunits
+++ b/data/tools/wmlunits
@@ -21,7 +21,7 @@ import unit_tree.html_output as html_output
 import unit_tree.overview
 import unit_tree.wiki_output as wiki_output
 
-TIMEOUT = 15
+TIMEOUT = 60
 
 def copy_images():
     print("Recolorizing pictures.")