diff --git a/language.version b/language.version
index 782be0988..b705a99d5 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r481 \cu(Tue 20 Sep 11:27:54 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r481 \cu(2022-09-20 11:27:54)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r482 \cu(Tue 20 Sep 11:28:10 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r482 \cu(2022-09-20 11:28:10)\c-";
diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc
index efabb9170..11a2eb705 100644
--- a/zscript/weapons/swwm_cbt.zsc
+++ b/zscript/weapons/swwm_cbt.zsc
@@ -30,6 +30,7 @@ Class Wallbuster : SWWMWeapon
 	{
 		Super.DoEffect();
 		// push back selection order if weapon is unloaded
+		if ( !bInitialized ) return;
 		for ( int i=0; i<25; i++ )
 		{
 			if ( !loaded[i] || fired[i] ) continue;
diff --git a/zscript/weapons/swwm_shot.zsc b/zscript/weapons/swwm_shot.zsc
index fd9a02ae2..352d75b93 100644
--- a/zscript/weapons/swwm_shot.zsc
+++ b/zscript/weapons/swwm_shot.zsc
@@ -157,6 +157,7 @@ Class Spreadgun : SWWMWeapon
 	{
 		Super.DoEffect();
 		// push back selection order if weapon is unloaded
+		if ( !bInitialized ) return;
 		SelectionOrder = (chambered&&!fired)?default.SelectionOrder:1500;
 	}