diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index b7daf1547355..b46b23ddf2f4 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -112,10 +112,11 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 	for(var/datum/callback/callback as anything in post_change_callbacks)
 		callback.InvokeAsync(W)
 
-	if(new_baseturfs)
-		W.baseturfs = baseturfs_string_list(new_baseturfs, W)
-	else
-		W.baseturfs = baseturfs_string_list(old_baseturfs, W) //Just to be safe
+	if(isturf(W))
+		if(new_baseturfs)
+			W.baseturfs = baseturfs_string_list(new_baseturfs, W)
+		else
+			W.baseturfs = baseturfs_string_list(old_baseturfs, W) //Just to be safe
 
 	W.explosion_id = old_exi
 	W.explosion_level = old_exl
diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm
index 1f4a36c0c160..2a520699463a 100644
--- a/code/modules/shuttle/docking.dm
+++ b/code/modules/shuttle/docking.dm
@@ -362,4 +362,5 @@
 	for(var/i = 1, i <= length(turfs), i++)
 		var/turf/open/T = turfs[i]
 		if(istype(T))
-			T.air.copy_from_turf(T)
+			if(isopenturf(T))
+				T.air.copy_from_turf(T)