From 38833c18c467a236c89ed7b78b3ff9e7a8c2dcf3 Mon Sep 17 00:00:00 2001
From: Neerti <neerti01@gmail.com>
Date: Thu, 19 Nov 2015 08:40:41 -0500
Subject: [PATCH] Adds check if something in hand would have access before
 returning it.

---
 code/game/jobs/access.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index e1fb87e974c..d95c555e0f7 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -199,7 +199,9 @@
 /mob/living/carbon/human/GetIdCard()
 	if(get_active_hand())
 		var/obj/item/I = get_active_hand()
-		return I.GetID()
+		var/id = I.GetID()
+		if(id)
+			return id
 	if(wear_id)
 		var/id = wear_id.GetID()
 		if(id)