diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 0af98c22a0..9d94d64020 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -18,14 +18,10 @@
 		var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD]
 		if(card_slot)
 			return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name
-	var/obj/item/card/id/ID
-	if(istype(I,/obj/item/pda))
-		var/obj/item/pda/ourPDA = I
-		ID = ourPDA.id
-	else if(istype(I,/obj/item/card/id))
-		ID = I
-	if(registered_name == ID.registered_name)
+	var/obj/item/card/id/ID = I.getID()
+	if(ID && registered_name == ID.registered_name)
 		return TRUE
+	return FALSE
 
 /obj/structure/closet/secure_closet/personal/PopulateContents()
 	..()