diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 100ebcae43e..98e2de66870 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -21,7 +21,7 @@
 	mappath = "[prefix][shuttle_id].dmm"
 	. = ..()
 
-/datum/map_template/shuttle/load(turf/T, centered)
+/datum/map_template/shuttle/load(turf/T, centered, register=TRUE)
 	. = ..()
 	if(!.)
 		return
@@ -35,6 +35,10 @@
 			continue
 		place.baseturfs.Insert(3, /turf/baseturf_skipover/shuttle)
 
+		if(register)
+			for(var/obj/docking_port/mobile/port in place)
+				port.register()
+
 		for(var/obj/structure/closet/closet in place)
 			if(closet.anchorable)
 				closet.anchored = TRUE
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 4fe31d6ddea..7288d9e3e07 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -81,8 +81,6 @@
 				candidates -= M
 			else
 				notify_ghosts("Space pirates are waking up!", source = spawner, action=NOTIFY_ATTACK, flashwindow = FALSE)
-		for(var/obj/docking_port/mobile/port in A)
-			port.register()
 
 	priority_announce("Unidentified armed ship detected near the station.")
 
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index ecd138d73bc..61895c041b6 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -215,8 +215,7 @@
 		D = existing_shuttle.get_docked()
 
 	if(!D)
-		var/m = "No dock found for preview shuttle ([preview_template.name]), aborting."
-		throw EXCEPTION(m)
+		CRASH("No dock found for preview shuttle ([preview_template.name]), aborting.")
 
 	var/result = preview_shuttle.canDock(D)
 	// truthy value means that it cannot dock for some reason
@@ -254,7 +253,7 @@
 	. = FALSE
 	// load shuttle template, centred at shuttle import landmark,
 	var/turf/landmark_turf = get_turf(locate(/obj/effect/landmark/shuttle_import) in GLOB.landmarks_list)
-	S.load(landmark_turf, centered = TRUE)
+	S.load(landmark_turf, centered = TRUE, register = FALSE)
 
 	var/affected = S.get_affected_turfs(landmark_turf, centered=TRUE)