diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index a77f6e4e8ad..0dcf1b4908c 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -131,8 +131,7 @@ SUBSYSTEM_DEF(shuttle)
 	for(var/obj/docking_port/stationary/S in stationary)
 		if(S.id == id)
 			return S
-	if(!alone_shuttle)
-		log_runtime(EXCEPTION("couldn't find dock with id: [id]"))
+	log_runtime(EXCEPTION("couldn't find dock with id: [id]"))
 
 /datum/controller/subsystem/shuttle/proc/secondsToRefuel()
 	var/elapsed = world.time - SSticker.round_start_time
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index d6e51cb02b6..9175b327882 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -603,7 +603,11 @@
 
 
 /obj/docking_port/mobile/proc/findRoundstartDock()
-	return SSshuttle.getDock(roundstart_move)
+	for(var/obj/docking_port/stationary/S in SSshuttle.stationary)
+		if(S.id == roundstart_move)
+			return S
+	if(alone_shuttle)
+		log_runtime(EXCEPTION("couldn't find roundstart dock for \"[name]\" with id: [id]"))
 
 /obj/docking_port/mobile/proc/dockRoundstart()
 	var/port = findRoundstartDock()