diff --git a/Customizations/JSON/LayoutConfig.ts b/Customizations/JSON/LayoutConfig.ts
index f98d6dde7..2ea37e380 100644
--- a/Customizations/JSON/LayoutConfig.ts
+++ b/Customizations/JSON/LayoutConfig.ts
@@ -73,7 +73,7 @@ export default class LayoutConfig {
         if (json.description === undefined) {
             throw "Description not defined in " + this.id;
         }
-        this.units = LayoutConfig.ExtractUnits(json, context);
+        this.units = LayoutConfig.ExtractUnits(json, context) ?? [];
         this.title = new Translation(json.title, context + ".title");
         this.description = new Translation(json.description, context + ".description");
         this.shortDescription = json.shortDescription === undefined ? this.description.FirstSentence() : new Translation(json.shortDescription, context + ".shortdescription");
diff --git a/UI/BigComponents/AttributionPanel.ts b/UI/BigComponents/AttributionPanel.ts
index 191320f99..b817ce440 100644
--- a/UI/BigComponents/AttributionPanel.ts
+++ b/UI/BigComponents/AttributionPanel.ts
@@ -43,7 +43,7 @@ export default class AttributionPanel extends Combine {
                 const links = sorted.map(kv => `<a href="https://openstreetmap.org/user/${kv.name}" target="_blank">${kv.name}</a>`)
                 const contribs = links.join(", ")
 
-                if (hiddenCount == 0) {
+                if (hiddenCount <= 0) {
                     return Translations.t.general.attribution.mapContributionsBy.Subs({
                         contributors: contribs
                     })
diff --git a/UI/Popup/TagRenderingQuestion.ts b/UI/Popup/TagRenderingQuestion.ts
index 21cac5c97..97627fa4b 100644
--- a/UI/Popup/TagRenderingQuestion.ts
+++ b/UI/Popup/TagRenderingQuestion.ts
@@ -50,7 +50,7 @@ export default class TagRenderingQuestion extends UIElement {
                 cancelButton?: BaseUIElement
     ) {
         super(tags);
-        this._applicableUnit = units.filter(unit => unit.isApplicableToKey(configuration.freeform?.key))[0];
+        this._applicableUnit = (units ?? []).filter(unit => unit.isApplicableToKey(configuration.freeform?.key))[0];
         this._tags = tags;
         this._configuration = configuration;
         this._cancelButton = cancelButton;