diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc
index 1094607..b2d4782 100644
--- a/zscript/eightball.zsc
+++ b/zscript/eightball.zsc
@@ -313,7 +313,7 @@ Class UTRocketLauncher : UTWeapon
 			crosshair = 0;
 			return;
 		}
-		if ( LockedOn && (!LockedTarget || (LockedTarget.Health <= 0) || !LockedTarget.bIsMonster || LockedTarget.bKilled || LockedTarget.bCorpse || !LockedTarget.bShootable) )
+		if ( LockedOn && (!LockedTarget || (LockedTarget.Health <= 0) || !LockedTarget.bIsMonster || LockedTarget.bKilled || LockedTarget.bCorpse || !LockedTarget.bShootable || (Owner.player.ReadyWeapon != self)) )
 		{
 			LockedTarget = null;
 			LockedOn = false;
diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc
index 983b16a..c5432ac 100644
--- a/zscript/utcommon.zsc
+++ b/zscript/utcommon.zsc
@@ -1964,7 +1964,7 @@ Class UTMainHandler : EventHandler
 		qf.c = c;
 		qf.tic = gametic;
 		qf.cam = camera;
-		let hnd = UTMainHandler(StaticEventHandler.Find("UTMainHandler"));
+		let hnd = UTMainHandler(EventHandler.Find("UTMainHandler"));
 		hnd.flashes.push(qf);
 	}