diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll
index bbe1087..528bef1 100644
Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ
diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll
index 64ac714..4e3a2ae 100644
Binary files a/1.4/MilkModule/Assemblies/MilkModule.dll and b/1.4/MilkModule/Assemblies/MilkModule.dll differ
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs
index 616f591..1fb0bae 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs
@@ -1,5 +1,6 @@
 using HarmonyLib;
 using RimWorld;
+using rjw;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -84,6 +85,7 @@ namespace RJW_Menstruation
         {
             foreach (Hediff diff in diffs)
             {
+                if (diff.Part != Genital_Helper.get_genitalsBPR(diff.pawn)) continue;
                 HediffComp_Menstruation comp = diff.GetMenstruationCompFromVagina();
                 if (comp != null) return comp;
             }
diff --git a/changelogs.txt b/changelogs.txt
index 7090d1f..2e68aa8 100644
--- a/changelogs.txt
+++ b/changelogs.txt
@@ -1,5 +1,6 @@
 Version 1.0.9.2
  - Fixed the no bleeding gene having positive metabolic efficiency instead of negative.
+ - Removed status button in health tab for non-genitals to avoid errors.
  - Handle errors more gracefully when starting a pregnancy.
 
 Version 1.0.9.1