diff --git a/code/modules/shuttle/lance_docking_targeter.dm b/code/modules/shuttle/lance_docking_targeter.dm
index f758267d20b..9b89bc51916 100644
--- a/code/modules/shuttle/lance_docking_targeter.dm
+++ b/code/modules/shuttle/lance_docking_targeter.dm
@@ -27,7 +27,7 @@
 		to_chat(user, "<span class='warning'>You'll want this to dock on the station.</span>")
 		return
 	var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST)
-	var/dir_choice = tgui_input_list(user, "Select the new docking area orientation.", "Dock Orientation", dir_choices)
+	var/dir_choice = tgui_input_list(user, "Which direction should the shuttle approach from?", "Dock Orientation", dir_choices)
 	if(!dir_choice)
 		return
 
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 95089f65910..1f4a3af6c0b 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -638,6 +638,8 @@
 					M.buckled.unbuckle_mob(M, force = TRUE)
 				if(isliving(AM))
 					var/mob/living/L = AM
+					if(L.incorporeal_move || L.status_flags & GODMODE)
+						continue
 					L.stop_pulling()
 					L.visible_message("<span class='warning'>[L] is hit by \
 									a hyperspace ripple!</span>",