diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 2302c12165f..275c533958f 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -109,11 +109,12 @@
 		return 1
 
 	else if(issilicon(M))
-		var/mob/living/silicon/robot/R = M
-		if(R.activated(/obj/item/borg/combat/shield))
-			add_logs(M, user, "flashed", object="[src.name]")
-			user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!</span>")
-			return 1
+		if(isrobot(M))
+			var/mob/living/silicon/robot/R = M
+			if(R.activated(/obj/item/borg/combat/shield))
+				add_logs(M, user, "flashed", object="[src.name]")
+				user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!</span>")
+				return 1
 		else
 			M.Weaken(rand(5,10))
 			add_logs(M, user, "flashed", object="[src.name]")
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 02ff686e836..1c222c9a298 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -305,6 +305,7 @@
 
 
 /mob/living/proc/process_nations()
-	var/client/C = client
-	for(var/mob/living/carbon/human/H in view(world.view, src))
-		C.images += H.hud_list[NATIONS_HUD]
\ No newline at end of file
+	if(client)
+		var/client/C = client
+		for(var/mob/living/carbon/human/H in view(world.view, src))
+			C.images += H.hud_list[NATIONS_HUD]
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index cc64a760097..a7e0f45535e 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -418,13 +418,12 @@
 	src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
 	src.modules += new /obj/item/borg/combat/shield(src)
 	src.modules += new /obj/item/borg/combat/mobility(src)
-	src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 
 	fix_modules()
 
 /obj/item/weapon/robot_module/peacekeeper
-	name = "peacekeepert robot module"
+	name = "peacekeeper robot module"
 
 /obj/item/weapon/robot_module/peacekeeper/New()
 	src.modules += new /obj/item/device/flash/cyborg(src)
@@ -433,7 +432,6 @@
 	src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
 	src.modules += new /obj/item/borg/combat/shield(src)
 	src.modules += new /obj/item/borg/combat/mobility(src)
-	src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 
 	fix_modules()