diff --git a/HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs b/HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs
index 8b9ef34e..0823ed06 100644
--- a/HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs
+++ b/HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs
@@ -371,6 +371,11 @@ private static void CheckBrepOrientation(Brep brep)
 
         private Brep ApplyWallOpen(IEnumerable<StbOpen> opens, StbWall wall, IReadOnlyList<Point3d> wallPts, Brep brep)
         {
+            if (brep == null)
+            {
+                return brep;
+            }
+
             double thickness = BrepMaker.Wall.GetThickness(_sections, wall);
             var centerCurve = new PolylineCurve(wallPts);
             Vector3d normal = Vector3d.CrossProduct(centerCurve.TangentAtEnd, centerCurve.TangentAtStart);
diff --git a/website/docs/Changelog.md b/website/docs/Changelog.md
index 8d57cccd..6610cd49 100644
--- a/website/docs/Changelog.md
+++ b/website/docs/Changelog.md
@@ -5,6 +5,14 @@ title: Changelog
 
 ---
 
+## [v2.2.1 - 2022-3-22](https://github.com/hrntsm/HoaryFox/releases/tag/v2.2.1)
+
+### 修正
+
+- v2.2.0 の変更で壁生成に失敗することがあったため、修正
+
+---
+
 ## [v2.2.0 - 2022-3-21](https://github.com/hrntsm/HoaryFox/releases/tag/v2.2.0)
 
 ### 追加
diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md
index ae908a3e..67cd0f11 100644
--- a/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md
+++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md
@@ -5,6 +5,14 @@ title: Changelog
 
 ---
 
+## [v2.2.1 - 2022-3-22](https://github.com/hrntsm/HoaryFox/releases/tag/v2.2.1)
+
+### FIX
+
+- Fixed wall generation failure with v2.2.0 changes.
+
+---
+
 ## [v2.2.0 - 2022-3-21](https://github.com/hrntsm/HoaryFox/releases/tag/v2.2.0)
 
 ### ADD