diff --git a/src/gui/auxiliary/window_builder.cpp b/src/gui/auxiliary/window_builder.cpp
index 4732c041be58..ab75d177d784 100644
--- a/src/gui/auxiliary/window_builder.cpp
+++ b/src/gui/auxiliary/window_builder.cpp
@@ -399,8 +399,8 @@ twindow_builder::tresolution::tresolution(const config& cfg)
 	, click_dismiss(cfg["click_dismiss"].to_bool())
 	, definition(cfg["definition"])
 	, linked_groups()
-	, tooltip(cfg.child_or_empty("tooltip"))
-	, helptip(cfg.child_or_empty("helptip"))
+	, tooltip(cfg.child_or_empty("tooltip"), "tooltip")
+	, helptip(cfg.child_or_empty("helptip"), "helptip")
 	, grid(0)
 {
 	if(!cfg["functions"].empty()) {
@@ -452,10 +452,10 @@ twindow_builder::tresolution::tresolution(const config& cfg)
 	}
 }
 
-twindow_builder::tresolution::ttip::ttip(const config& cfg) : id(cfg["id"])
+twindow_builder::tresolution::ttip::ttip(const config& cfg, const std::string& tagname) : id(cfg["id"])
 {
 	VALIDATE(!id.empty(),
-			 missing_mandatory_wml_key("[window][resolution][tip]", "id"));
+			 missing_mandatory_wml_key("[window][resolution][" + tagname + "]", "id"));
 }
 
 /*WIKI
diff --git a/src/gui/auxiliary/window_builder.hpp b/src/gui/auxiliary/window_builder.hpp
index 5d84aa29ef72..474267f1fa57 100644
--- a/src/gui/auxiliary/window_builder.hpp
+++ b/src/gui/auxiliary/window_builder.hpp
@@ -203,7 +203,7 @@ class twindow_builder
 		/** Helper struct to store information about the tips. */
 		struct ttip
 		{
-			ttip(const config& cfg);
+			ttip(const config& cfg, const std::string& tagname);
 
 			std::string id;
 		};