diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm
index fdb8fb7c23a..b980e24c108 100644
--- a/code/game/machinery/camera.dm
+++ b/code/game/machinery/camera.dm
@@ -212,12 +212,12 @@
 		L.Add(C)
 
 	camera_sort(L)
+	L = camera_network_sort(L)
 
 	var/list/D = list()
 	for (var/obj/machinery/camera/C in L)
 		if ( C.network in src.networks )
 			D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C
-	D = camera_network_sort(D)
 	D["Cancel"] = "Cancel"
 
 	var/t = input(user, "Which camera should you change to?") as null|anything in D
diff --git a/code/game/machinery/telecomms/telecommunications.dm b/code/game/machinery/telecomms/telecommunications.dm
index a84aff8bede..6e9d41ea4d8 100644
--- a/code/game/machinery/telecomms/telecommunications.dm
+++ b/code/game/machinery/telecomms/telecommunications.dm
@@ -393,6 +393,8 @@
 
 				var/datum/comm_log_entry/log = new
 				var/mob/M = signal.data["mob"]
+				if(istype(M, /mob/new_player))
+					return //Kludgy fix, will route out the real cause later --mloc
 
 				// Copy the signal.data entries we want
 				log.parameters["mobtype"] = signal.data["mobtype"]