diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index f4e1b706c0..54c1ac6b07 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -124,6 +124,8 @@
 	var/name_2 = pick(src.org_names_2)
 
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
+
 	var/fingerprints = num2text(md5(H.dna.uni_identity))
 	var/traitor_name = H.real_name
 	var/prob_right_dude = rand(1, 100)
@@ -147,6 +149,7 @@
 
 	var/prob_right_dude = rand(1, 100)
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
 	var/traitor_job = H.mind.assigned_role
 
 	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can."
@@ -165,6 +168,7 @@
 
 	var/prob_right_dude = rand(1, 100)
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
 	var/traitor_job = H.mind.assigned_role
 
 	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector."
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index c1aafb0721..079b1ab7eb 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -48,8 +48,8 @@
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
-	minimal_access = list(access_medical, access_morgue, access_surgery)
-	alt_titles = list("Surgeon","Emergency Physician","Nurse","Orderly")
+	minimal_access = list(access_medical, access_morgue, access_surgery, access_virology)
+	alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -74,11 +74,12 @@
 				if("Medical Doctor")
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
-				if("Orderly")
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
 				if("Nurse")
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
-					H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+					if(H.gender == FEMALE)
+						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
+						H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+					else
+						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
 		else
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
@@ -151,7 +152,7 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
-/datum/job/virologist
+/*/datum/job/virologist
 	title = "Virologist"
 	flag = VIROLOGIST
 	department_flag = MEDSCI
@@ -182,4 +183,4 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		return 1
+		return 1*/