From a6d06ea397c2fdf494dd078b2be4e18f2a8d561d Mon Sep 17 00:00:00 2001
From: Kyep <Kyep@users.noreply.github.com>
Date: Sun, 6 May 2018 22:21:35 -0700
Subject: [PATCH] Fixes #8271 - rare borg runtimes

---
 code/modules/mob/living/silicon/robot/robot.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 9be14600a3a..c623cc3cad6 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -883,9 +883,10 @@ var/list/robot_verbs_default = list(
 			icon_state = "[base_icon]-roll"
 		else
 			icon_state = base_icon
-		for(var/obj/item/borg/combat/shield/S in module.modules)
-			if(activated(S))
-				overlays += "[base_icon]-shield"
+		if(module)
+			for(var/obj/item/borg/combat/shield/S in module.modules)
+				if(activated(S))
+					overlays += "[base_icon]-shield"
 	update_fire()
 
 /mob/living/silicon/robot/proc/installed_modules()