From 694716b0e461d47f61ed6af7cdbfa85906ed9f90 Mon Sep 17 00:00:00 2001
From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date: Mon, 11 Jul 2022 15:26:48 -0400
Subject: [PATCH] Update shuttle_manipulator.dm (#18339)

---
 code/modules/shuttle/shuttle_manipulator.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index a73ef487189..f0b74af9945 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -105,6 +105,8 @@
 	data["shuttles"] = list()
 	for(var/i in SSshuttle.mobile)
 		var/obj/docking_port/mobile/M = i
+		if(!M)
+			continue
 		var/list/L = list()
 		L["name"] = M.name
 		L["id"] = M.id