From 8e6dee515a790a7001b6bf1557bf846b99f39061 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 12 Jun 2020 17:16:36 -0700
Subject: [PATCH] null isn't an object

---
 code/__DEFINES/is_helpers.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 1bd18776af..ced05633b4 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -1,5 +1,5 @@
 /// Checks if something is a BYOND object datatype rather than a primitive, or whatever's closest to one.
-#define is_object_datatype(object)		(!istext(object) && !isnum(object))
+#define is_object_datatype(object)		(object && !istext(object) && !isnum(object))
 
 // simple is_type and similar inline helpers