From e4abffb8a4ce26f89fae651d3a73679003c63818 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 30 Sep 2019 22:37:10 -0800
Subject: [PATCH] Merge pull request #6469 from Verkister/patch-23

Fixes runtime cascade on advanced locator circuit
---
 code/modules/integrated_electronics/subtypes/input.dm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index e3fcb5d985..4ac81ea4cc 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -308,11 +308,12 @@
 	var/list/valid_things = list()
 	if(isweakref(I.data))
 		var/atom/A = I.data.resolve()
-		var/desired_type = A.type
-		if(desired_type)
-			for(var/atom/thing in nearby_things)
-				if(thing.type == desired_type)
-					valid_things.Add(thing)
+		if(A)
+			var/desired_type = A.type
+			if(desired_type)
+				for(var/atom/thing in nearby_things)
+					if(thing.type == desired_type)
+						valid_things.Add(thing)
 	else if(istext(I.data))
 		var/DT = I.data
 		for(var/atom/thing in nearby_things)