diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt
index 11c678ea4b..aa8d007904 100644
--- a/core/src/com/unciv/models/ruleset/unique/Unique.kt
+++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt
@@ -131,8 +131,10 @@ class UniqueMap: HashMap<String, ArrayList<Unique>>() {
     fun getAllUniques() = this.asSequence().flatMap { it.value.asSequence() }
 }
 
+/** DOES NOT hold untyped uniques! */
 class UniqueMapTyped: EnumMap<UniqueType, ArrayList<Unique>>(UniqueType::class.java) {
     fun addUnique(unique: Unique) {
+        if(unique.type==null) return
         if (!containsKey(unique.type)) this[unique.type] = ArrayList()
         this[unique.type]!!.add(unique)
     }