diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index edf4560e8ba..27f3f7e0ece 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -182,7 +182,7 @@
 	update_icon()
 
 /obj/item/gun/ballistic/can_shoot()
-	return (chambered || magazine || magazine.ammo_count(FALSE))
+	return chambered
 
 /obj/item/gun/ballistic/attackby(obj/item/A, mob/user, params)
 	..()
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index e65a59a11dd..55631a003f7 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -268,7 +268,7 @@
 		..()
 		return
 	if (!cover_open)
-		to_chat("<span class='warning'>[src]'s cover is closed! Open it before trying to remove the magazine!</span>")
+		to_chat(user, "<span class='warning'>[src]'s cover is closed! Open it before trying to remove the magazine!</span>")
 		return
 	..()