diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 4a1000ef..f3f4a118 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -109,6 +109,8 @@
 
 /obj/item/reagent_containers/food/drinks/after_throw(datum/callback/callback)
 	. = ..()
+	if (!isGlass)
+		return
 	if (!QDELETED(src) || !QDELING(src))	//If we didn't get qdeleted by smash(), assume we got flung by a bartender
 		transform = initial(transform)
 		to_chat(viewers(8, get_turf(src)), "<span class='notice'>\The [src] lands upright without spilling a drop!</span>")
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 727a336c..31c80248 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -85,7 +85,7 @@
 /obj/item/reagent_containers/proc/bartender_check(atom/target)
 	. = FALSE
 	var/turf/T = get_turf(src)
-	if(!T || !thrownby || !thrownby.actions) //|| target.CanPass(src, T) || !thrownby || !thrownby.actions)
+	if(!T || !thrownby || !thrownby.actions)
 		return
 	for(var/datum/action/innate/D in thrownby.actions)
 		if(D.active && istype(D, /datum/action/innate/drink_fling))