From 4e1f343bd8e2212ed05fee6ad8db1488c560d0ac Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:32:19 +0200
Subject: [PATCH] Adds a safety check to the "Release Obj" admin proc. (#60163)

---
 code/modules/admin/verbs/possess.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index 2ae5cba6d32..d10ec67d139 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -29,9 +29,11 @@
 /proc/release()
 	set name = "Release Obj"
 	set category = "Object"
-	//usr.loc = get_turf(usr)
 
-	if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
+	if(!usr.control_object) //lest we are banished to the nullspace realm.
+		return
+
+	if(usr.name_archive) //if you have a name archived
 		usr.real_name = usr.name_archive
 		usr.name_archive = ""
 		usr.name = usr.real_name