diff --git a/modular_splurt/code/datums/components/organ_inflation.dm b/modular_splurt/code/datums/components/organ_inflation.dm
index e6b2c6c5f2..34fcafbf06 100644
--- a/modular_splurt/code/datums/components/organ_inflation.dm
+++ b/modular_splurt/code/datums/components/organ_inflation.dm
@@ -74,7 +74,7 @@
 	deflate_organ()
 
 /datum/component/organ_inflation/proc/inflate_organ(new_size)
-	if(!container.owner?.client?.prefs?.pregnancy_inflation)
+	if(!container?.owner?.client?.prefs?.pregnancy_inflation)
 		return
 
 	switch(container.slot)
@@ -92,7 +92,7 @@
 			belly?.modify_size(new_size)
 
 /datum/component/organ_inflation/proc/deflate_organ()
-	if(!container.owner)
+	if(!container?.owner)
 		return
 
 	switch(container.slot)
diff --git a/modular_splurt/code/datums/components/pregnancy.dm b/modular_splurt/code/datums/components/pregnancy.dm
index 6389bc3ea1..a4cd7df29b 100644
--- a/modular_splurt/code/datums/components/pregnancy.dm
+++ b/modular_splurt/code/datums/components/pregnancy.dm
@@ -353,7 +353,7 @@
 	carrier.adjustStaminaLoss(200)
 	SEND_SIGNAL(carrier, COMSIG_ADD_MOOD_EVENT, "pregnancy_end", /datum/mood_event/pregnant_positive)
 
-	//eggo.TakeComponent(src)
+	oviposition = FALSE
 	eggo.forceMove(location)
 
 	return TRUE