diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 1de985ca3a..e50eeb8619 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -131,7 +131,7 @@
 				if(M.stat == DEAD)
 					if(M.timeofdeath + 6000 < world.time)
 						continue
-				if(is_eligible(I.imp_in))
+				if(is_eligible(M))
 					L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I
 
 		var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index e9245e233a..5fa0624c0a 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -82,7 +82,7 @@
 						if (M.timeofdeath + 6000 < world.time)
 							continue
 
-					var/turf/tr = get_turf(W.imp_in)
+					var/turf/tr = get_turf(M)
 					if (tr.z == sr.z && tr)
 						var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
 						if (direct < 20)