diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3cc77e56a1b..a31a5fc95c7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -694,6 +694,12 @@
// if looting pockets with gloves, do it quietly
if(href_list["pockets"])
+ if(isanimal(usr))
+ return //animals cannot strip people
+
+ if(target.frozen)
+ source << "\red Do not attempt to strip frozen people."
+ return
var/pocket_side = href_list["pockets"]
var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store)
var/obj/item/pocket_item = (pocket_id == slot_r_store ? src.r_store : src.l_store)
@@ -720,16 +726,19 @@
// Update strip window
if(usr.machine == src && in_range(src, usr))
show_inv(usr)
-
-
-
+
else if(!pickpocket)
// Display a warning if the user mocks up
src << "You feel your [pocket_side] pocket being fumbled with!"
-
// if looting id with gloves, do it quietly - this allows pickpocket gloves to take/place id stealthily - Bone White
if(href_list["item"])
+ if(isanimal(usr))
+ return //animals cannot strip people
+
+ if(target.frozen)
+ source << "\red Do not attempt to strip frozen people."
+ return
var/itemTarget = href_list["item"]
if(itemTarget == "id")
if(pickpocket)
@@ -762,9 +771,6 @@
// Display a warning if the user mocks up
src << "You feel your ID slot being fumbled with!"
-
-
-
if (href_list["refresh"])
if((machine)&&(in_range(src, usr)))
show_inv(machine)
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 14a3733154d..9cba0094d4d 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -369,6 +369,8 @@
/mob/living/silicon/pai/proc/hackloop()
var/turf/T = get_turf_or_move(src.loc)
for(var/mob/living/silicon/ai/AI in player_list)
+ if(!T || !(T.z in config.contact_levels))
+ break
if(T.loc)
AI << "Network Alert: Brute-force encryption crack in progress in [T.loc]."
else