diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 23389f507a9..786300f00d5 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -118,8 +118,10 @@
 				areaindex[tmpname] = 1
 			L[tmpname] = I
 
-	var/desc = input("Please select a location to lock in.", "Locking Computer") in L
-	if(get_dist(src, usr) > 1)
+	var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null
+	if(!desc)
+		return
+	if(get_dist(src, usr) > 1 && !issilicon(usr))
 		return
 
 	src.locked = L[desc]
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 642a7df8e44..c3d88300ca6 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -68,7 +68,7 @@
 /mob/living/simple_animal/cat/MouseDrop(atom/over_object)
 
 	var/mob/living/carbon/H = over_object
-	if(!istype(H)) return ..()
+	if(!istype(H) || !Adjacent(H)) return ..()
 
 	if(H.a_intent == "help")
 		get_scooped(H)