From b9926200119ccdef0760bca74c27da2057bcae86 Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Mon, 8 Apr 2019 12:54:06 -0700
Subject: [PATCH] Fix runtime when setting up a sec character before atoms
 initialize (#43527)

---
 code/modules/projectiles/guns/energy.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 24ae7a77548..47fcb0979ad 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -57,7 +57,8 @@
 	fire_delay = shot.delay
 
 /obj/item/gun/energy/Destroy()
-	QDEL_NULL(cell)
+	if (cell)
+		QDEL_NULL(cell)
 	STOP_PROCESSING(SSobj, src)
 	return ..()