diff --git a/Logic/Tags/TagUtils.ts b/Logic/Tags/TagUtils.ts
index caca5c0b7..2688d3140 100644
--- a/Logic/Tags/TagUtils.ts
+++ b/Logic/Tags/TagUtils.ts
@@ -336,7 +336,7 @@ export class TagUtils {
             if (json["or"] !== undefined) {
                 return new Or(json["or"].map(t => TagUtils.Tag(t, context)));
             }
-            throw "At " + context + ": unrecognized tag"
+            throw `At ${context}: unrecognized tag: ${JSON.stringify(json)}`
         }
 
 
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 0ae793e59..133a2bf0f 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -45,7 +45,7 @@
     }
   ],
   "calculatedTags": [
-    "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined)",
+    "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined).filter(p => p.width !== undefined)",
     "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)?.at(0)",
     "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)"
   ],
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 60452cb5b..90048681e 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -331,6 +331,10 @@
                 "if": "theme=uk_addresses",
                 "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
               },
+              {
+                "if": "theme=walls_and_buildings",
+                "then": "./assets/layers/walls_and_buildings/walls_and_buildings.png"
+              },
               {
                 "if": "theme=waste",
                 "then": "./assets/layers/recycling/recycling-14.svg"