diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 8b034205659..6b94e28d91b 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -8,10 +8,10 @@
 	return null
 
 /proc/get_area(atom/A)
-	if(!istype(A))
-		return
-	for(A, A && !isarea(A), A=A.loc); //semicolon is for the empty statement
-	return A
+	if(isarea(A))
+		return A
+	var/turf/T = get_turf(A)
+	return T ? T.loc : null
 
 /proc/get_area_name(N) //get area by its name
 	for(var/area/A in world)