From 80c80abe3abf4a8d6f1461870aa0d59e9f1bc229 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sun, 21 Jun 2015 02:39:25 -0400
Subject: [PATCH] Fixes #9511

---
 code/modules/shuttles/shuttle_specops.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 078d1e9a5a5..b4e791670eb 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -23,6 +23,10 @@
 		docking_controller_offsite = locate(docking_controller_tag_offsite)
 		if(!istype(docking_controller_offsite))
 			world << "<span class='danger'>warning: shuttle with docking tag [docking_controller_offsite] could not find it's controller!</span>"
+	if (!location)
+		docking_controller = docking_controller_station
+	else
+		docking_controller = docking_controller_offsite
 
 /datum/shuttle/ferry/multidock/move(var/area/origin,var/area/destination)
 	..(origin, destination)