diff --git a/language.version b/language.version
index 89d654ef6..c28eeb125 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r674 \cu(Fri 11 Dec 22:51:47 CET 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r674 \cu(Sat 12 Dec 00:15:07 CET 2020)";
diff --git a/pk7/excl.lst b/pk7/excl.lst
index 07ed69260..e84d2c962 100644
--- a/pk7/excl.lst
+++ b/pk7/excl.lst
@@ -11,3 +11,4 @@ lore/mklang*
 models/*.blend
 models/*.blend1
 models/*.xcf
+tools
diff --git a/zscript/swwm_cbt.zsc b/zscript/swwm_cbt.zsc
index 760d21ae2..13f9e424a 100644
--- a/zscript/swwm_cbt.zsc
+++ b/zscript/swwm_cbt.zsc
@@ -931,6 +931,7 @@ Class Wallbuster : SWWMWeapon
 	override void HudTick()
 	{
 		Super.HudTick();
+		if ( !Owner ) return;
 		// 25-trace
 		for ( int i=0; i<25; i++ )
 			[cpos25[i], ccol25[i]] = TraceForCrosshair25(i);
diff --git a/zscript/swwm_inventory.zsc b/zscript/swwm_inventory.zsc
index 430520aca..ccf7a4f12 100644
--- a/zscript/swwm_inventory.zsc
+++ b/zscript/swwm_inventory.zsc
@@ -1092,6 +1092,7 @@ Class SWWMWeapon : Weapon abstract
 	// HUD-side ticking
 	virtual ui void HudTick()
 	{
+		if ( !Owner ) return;
 		[cpos, ccol] = TraceForCrosshair();
 		// avoid jumpy switching
 		if ( Owner.player.PendingWeapon is 'SWWMWeapon' )
diff --git a/zscript/swwm_splode.zsc b/zscript/swwm_splode.zsc
index e1e049de9..b6a5a3d46 100644
--- a/zscript/swwm_splode.zsc
+++ b/zscript/swwm_splode.zsc
@@ -316,6 +316,7 @@ Class ExplodiumGun : SWWMWeapon
 
 	override void HudTick()
 	{
+		if ( !Owner ) return;
 		[cpos, ccol] = TraceForCrosshair();
 		let sw = SWWMWeapon(SisterWeapon);
 		// avoid jumpy switching
@@ -740,6 +741,7 @@ Class DualExplodiumGun : SWWMWeapon
 
 	override void HudTick()
 	{
+		if ( !Owner ) return;
 		[cpos, ccol] = TraceForCrosshair();
 		let sw = SWWMWeapon(SisterWeapon);
 		// avoid jumpy switching