diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index b8b83f7cfdb..dfed01db9ef 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -138,9 +138,7 @@
 /obj/item/device/warp_cube/attack_self(mob/user)
 	if(!linked)
 		user << "[src] fizzles uselessly."
-	if(linked.z == CENTCOMM)
-		user << "[linked] is somewhere you can't go."
-
+		return
 	new /obj/effect/particle_effect/smoke(user.loc)
 	user.forceMove(get_turf(linked))
 	feedback_add_details("warp_cube","[src.type]")
@@ -833,7 +831,7 @@
 		blast_range -= round(health_percent * 10) //one additional range for each missing 10% of health
 
 /obj/item/weapon/hierophant_club/update_icon()
-	icon_state = "hierophant_club[timer <= world.time ? "_ready":""][beacon ? "":"_beacon"]"
+	icon_state = "hierophant_club[timer <= world.time ? "_ready":""][(beacon && !qdeleted(beacon)) ? "":"_beacon"]"
 	item_state = icon_state
 	if(ismob(loc))
 		var/mob/M = loc
@@ -855,7 +853,7 @@
 	if(!user.is_holding(src)) //you need to hold the staff to teleport
 		user << "<span class='warning'>You need to hold the club in your hands to [beacon ? "teleport with it":"detach the beacon"]!</span>"
 		return
-	if(!beacon)
+	if(!beacon || qdeleted(beacon))
 		if(isturf(user.loc))
 			user.visible_message("<span class='hierophant_warning'>[user] starts fiddling with [src]'s pommel...</span>", \
 			"<span class='notice'>You start detaching the hierophant beacon...</span>")
@@ -908,7 +906,7 @@
 		new /obj/effect/overlay/temp/hierophant/telegraph(source, user)
 		playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
 		playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
-		if(!do_after(user, 3, target = user) || !user || !beacon) //no walking away shitlord
+		if(!do_after(user, 3, target = user) || !user || !beacon || qdeleted(beacon)) //no walking away shitlord
 			teleporting = FALSE
 			if(user)
 				user.update_action_buttons_icon()
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index b896fc1f1ec..65706d1e51a 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -12,7 +12,12 @@ var/list/blacklisted_cargo_types = typecacheof(list(
 		/obj/machinery/telepad,
 		/obj/machinery/quantumpad,
 		/obj/machinery/clonepod,
-		/obj/effect/mob_spawn
+		/obj/effect/mob_spawn,
+		/obj/effect/hierophant,
+		/obj/structure/recieving_pad,
+		/obj/effect/clockwork/spatial_gateway,
+		/obj/structure/destructible/clockwork/powered/clockwork_obelisk,
+		/obj/item/device/warp_cube
 	))
 
 /obj/docking_port/mobile/supply