From 07c8ebcff78025689db55100c3ce9187fc9ed00b Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sat, 30 Aug 2014 09:58:10 -0400
Subject: [PATCH] Fixes #6224

---
 code/game/machinery/camera/presets.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index fae3453aaa9..21a9dc10616 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -58,7 +58,7 @@
 
 /obj/machinery/camera/proc/isXRay()
 	var/obj/item/weapon/stock_parts/scanning_module/O = locate(/obj/item/weapon/stock_parts/scanning_module) in assembly.upgrades
-	if (O.rating >= 2)
+	if (O && O.rating >= 2)
 		return O
 	return null