diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
index 7cd6a8669e2..ef0afa2e6d0 100644
--- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
+++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
@@ -46,6 +46,8 @@ GLOBAL_LIST_EMPTY(cortical_borers)
 
 /obj/item/organ/borer_body/on_mob_insert(mob/living/carbon/carbon_target, special, movement_flags)
 	. = ..()
+	if(isnull(borer))
+		return // BUBBER TODO: Refactor this mess
 	for(var/datum/borer_focus/body_focus as anything in borer.body_focuses)
 		body_focus.on_add()
 	carbon_target.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm
index e0e90ffc1d7..27216eeee40 100644
--- a/modular_skyrat/modules/modular_implants/code/nifs.dm
+++ b/modular_skyrat/modules/modular_implants/code/nifs.dm
@@ -305,7 +305,8 @@
 
 			calibrating = FALSE
 			is_calibrated = TRUE
-
+			if(isnull(linked_mob.mind))
+				return // BUBBER TODO - Refactor NIFs
 			if(!linked_mob.save_individual_persistence())
 				stack_trace("persistence was not saved for [linked_mob]!")
 
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts.dm b/modular_skyrat/modules/modular_implants/code/nifsofts.dm
index 14d4604fa20..475932482ea 100644
--- a/modular_skyrat/modules/modular_implants/code/nifsofts.dm
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts.dm
@@ -56,7 +56,7 @@
 	///Is it a lewd item?
 	var/lewd_nifsoft = FALSE
 
-/datum/nifsoft/New(obj/item/organ/cyberimp/brain/nif/recepient_nif, no_rewards_points = FALSE)
+/datum/nifsoft/New(obj/item/organ/cyberimp/brain/nif/recipient_nif, no_rewards_points = FALSE)
 	. = ..()
 
 	if(no_rewards_points) //This is mostly so that credits can't be farmed through printed or stolen NIFSoft disks
@@ -65,9 +65,11 @@
 	compatible_nifs += /obj/item/organ/cyberimp/brain/nif/debug
 	program_name = name
 
-	if(!recepient_nif.install_nifsoft(src))
+	if(!recipient_nif.install_nifsoft(src))
 		qdel(src)
 
+	parent_nif = WEAKREF(recipient_nif)
+	linked_mob = recipient_nif.linked_mob
 	load_persistence_data()
 	update_theme()