diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
index 9596dc9286e..9cb057e946e 100644
--- a/code/datums/id_trim/jobs.dm
+++ b/code/datums/id_trim/jobs.dm
@@ -25,6 +25,9 @@
 /datum/id_trim/job/New()
 	if(ispath(job))
 		job = SSjob.get_job_type(job)
+		if (isnull(job))
+			// Not a valid job. Maybe removed by the map.
+			return
 
 	if(isnull(job_changes))
 		job_changes = SSmapping.current_map.job_changes
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index 4b0c44329b4..95bfe0e7b64 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -57,9 +57,9 @@
 	return CONTEXTUAL_SCREENTIP_SET
 
 /obj/machinery/computer/security/telescreen/entertainment/click_ctrl(mob/user)
-	. = ..()
 	balloon_alert(user, speakers.should_be_listening ? "muted" : "unmuted")
 	speakers.toggle_mute()
+	return CLICK_ACTION_SUCCESS
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertainment, 32)
 
diff --git a/code/game/say.dm b/code/game/say.dm
index 588e6946477..7199fe3e377 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -356,7 +356,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/virtualspeaker)
 	radio = _radio
 	source = M
 	if(istype(M))
-		name = radio.anonymize ? "Unknown" : M.get_voice(add_id_name = TRUE)
+		name = radio?.anonymize ? "Unknown" : M.get_voice(add_id_name = TRUE)
 		verb_say = M.get_default_say_verb()
 		verb_ask = M.verb_ask
 		verb_exclaim = M.verb_exclaim
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index 8eb313150bb..020b152b0ef 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -29,12 +29,12 @@ ADMIN_VERB(power_debug, R_DEBUG, "Check Power", "Verifies the integrity of the p
 		if (!PN.nodes || !PN.nodes.len)
 			if(PN.cables && (PN.cables.len > 1))
 				var/obj/structure/cable/C = PN.cables[1]
-				results += "Powernet with no nodes! (number [PN.number]) - example cable at [ADMIN_VERBOSEJMP(C)]"
+				results += "Powernet with no nodes! Example cable at [ADMIN_VERBOSEJMP(C)]"
 
 		if (!PN.cables || (PN.cables.len < 10))
 			if(PN.cables && (PN.cables.len > 1))
 				var/obj/structure/cable/C = PN.cables[1]
-				results += "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [ADMIN_VERBOSEJMP(C)]"
+				results += "Powernet with fewer than 10 cables! Example cable at [ADMIN_VERBOSEJMP(C)]"
 
 	for(var/turf/T in world.contents)
 		var/cable_layers //cache all cable layers (which are bitflags) present
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index c6bcc968b2f..04ed2d91fcf 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -420,8 +420,8 @@
 		stack_trace("pda_slot was set but we couldn't find a PDA!")
 		return
 
-	pda.imprint_id(equipped.real_name, equipped_job.title)
-	pda.update_ringtone(equipped_job.job_tone)
+	pda.imprint_id(equipped.real_name, equipped_job?.title || equipped.job)
+	pda.update_ringtone(equipped_job?.job_tone)
 	pda.UpdateDisplay()
 
 	var/client/equipped_client = GLOB.directory[ckey(equipped.mind?.key)]
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 852ae3a2008..c9741fcea13 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -3,7 +3,6 @@
 // each contiguous network of cables & nodes
 /////////////////////////////////////
 /datum/powernet
-	var/number // unique id
 	var/list/cables = list() // all cables & junctions
 	var/list/nodes = list() // all connected machines
 
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
old mode 100755
new mode 100644