diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index 28488a231fe..95193eee9ea 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -54,6 +54,7 @@
 		return
 	if(!target)
 		add_overlay("pinon[alert ? "alert" : ""]null")
+		return
 	var/turf/here = get_turf(src)
 	var/turf/there = get_turf(target)
 	if(here.z != there.z)
@@ -110,7 +111,8 @@
 		var/crewmember_name = "Unknown"
 		if(H.wear_id)
 			var/obj/item/card/id/I = H.wear_id.GetID()
-			crewmember_name = I.registered_name
+			if(I && I.registered_name)
+				crewmember_name = I.registered_name
 
 		while(crewmember_name in name_counts)
 			name_counts[crewmember_name]++