diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 6ce051b365..d4abaebf79 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -147,9 +147,14 @@ class Ruleset {
         return newRuleset
     }
 
-    private fun <T : INamed> createHashmap(items: Array<T>): LinkedHashMap<String, T> {
+    private inline fun <reified T : INamed> createHashmap(items: Array<T>): LinkedHashMap<String, T> {
         val hashMap = LinkedHashMap<String, T>(items.size)
         for (item in items) {
+            val name = try { item.name }
+            catch (ex: Exception) {
+                throw Exception("${T::class.simpleName} is missing a name!")
+            }
+
             hashMap[item.name] = item
             (item as? IRulesetObject)?.originRuleset = name
         }