diff --git a/code/game/objects/items/devices/scanners_vr.dm b/code/game/objects/items/devices/scanners_vr.dm
index 4d43debe3b7..362f1194759 100644
--- a/code/game/objects/items/devices/scanners_vr.dm
+++ b/code/game/objects/items/devices/scanners_vr.dm
@@ -165,14 +165,17 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
 			to_chat(usr,"<span class='warning'>Target seems totally braindead.</span>")
 			return
 
-		usr.visible_message("<span class='warning'>[usr] begins downloading [target]'s mind!</span>","<span class='notice'>You begin downloading [target]'s mind!</span>")
-		if(do_after(usr,35 SECONDS,target)) //This is powerful, yo.
-			if(!stored_mind && target.mind)
-				stored_mind = target.mind
-				target.ghostize()
-				stored_mind.current = null
-				update_icon()
-				to_chat(usr,"<span class='notice'>Mind downloaded!</span>")
+		var/choice = alert(usr,"This will remove the target's mind from their body. The only way to put it back is via a resleeving pod. Continue?","Confirmation","Continue","Cancel")
+		if(choice == "Continue" && usr.get_active_hand() == src && usr.Adjacent(target))
+
+			usr.visible_message("<span class='warning'>[usr] begins downloading [target]'s mind!</span>","<span class='notice'>You begin downloading [target]'s mind!</span>")
+			if(do_after(usr,35 SECONDS,target)) //This is powerful, yo.
+				if(!stored_mind && target.mind)
+					stored_mind = target.mind
+					target.ghostize()
+					stored_mind.current = null
+					update_icon()
+					to_chat(usr,"<span class='notice'>Mind downloaded!</span>")
 
 		return
 
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index eeea9fd1307..422944b573a 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -120,10 +120,10 @@
 
 				if("Erase Contents")
 					var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs
-					if(!brainpick) return
 
-					var/warning = alert(nif.human,"Are you SURE you want to erase [brainpick.name]?","Erase Mind","CANCEL","DELETE","CANCEL")
+					var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL")
 					if(warning == "DELETE")
+						brainmobs -= brainpick
 						qdel(brainpick)
 					return TRUE