diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 6bd4157554..e18a498246 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1060,16 +1060,18 @@ default behaviour is:
 	if(lying != lying_prev)
 		lying_prev = lying
 		update_transform()
-	//VOREStation Add
-	if(lying && LAZYLEN(buckled_mobs))
-		for(var/rider in buckled_mobs)
-			var/mob/living/L = rider
-			if(riding_datum)
-				riding_datum.force_dismount(L)
-			else
-				unbuckle_mob(L)
-			L.Stun(5)
-	//VOREStation Add End
+		//VOREStation Add
+		if(lying && LAZYLEN(buckled_mobs))
+			for(var/rider in buckled_mobs)
+				var/mob/living/L = rider
+				if(buckled_mobs[rider] != "riding")
+					continue // Only boot off riders
+				if(riding_datum)
+					riding_datum.force_dismount(L)
+				else
+					unbuckle_mob(L)
+				L.Stun(5)
+		//VOREStation Add End
 	return canmove
 
 // Adds overlays for specific modifiers.
diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm
index 4c9bdee890..b3c9688919 100644
--- a/code/modules/reagents/reagent_containers/syringes_vr.dm
+++ b/code/modules/reagents/reagent_containers/syringes_vr.dm
@@ -36,7 +36,7 @@
 	targets |= hash
 
 	//Grab any viruses they have
-	if(LAZYLEN(target.virus2.len))
+	if(iscarbon(target) && LAZYLEN(target.virus2.len))
 		LAZYINITLIST(viruses)
 		var/datum/disease2/disease/virus = pick(target.virus2.len)
 		viruses[hash] = virus.getcopy()
diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
index 38249c3b16..107af3d080 100644
--- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
@@ -49,6 +49,8 @@
 	riding_datum = new /datum/riding/taur(src)
 
 /mob/living/carbon/human/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE)
+	if(forced)
+		return ..() // Skip our checks
 	if(!isTaurTail(tail_style))
 		return FALSE
 	if(lying)
@@ -66,6 +68,8 @@
 		return FALSE
 	
 	. = ..()
+	if(.)
+		buckled_mobs[M] = "riding"
 
 /mob/living/carbon/human/MouseDrop_T(mob/living/M, mob/living/user)
 	if(can_buckle && istype(M))