diff --git a/language.version b/language.version
index a9d2566a1..b305cb858 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r547 \cu(Fri 18 Jun 11:17:01 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r547 \cu(2021-06-18 11:17:01)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r548 \cu(Sun 20 Jun 10:35:52 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r548 \cu(2021-06-20 10:35:52)\c-";
diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc
index 380b2aa4c..efed7e377 100644
--- a/zscript/handler/swwm_handler_worldthings.zsc
+++ b/zscript/handler/swwm_handler_worldthings.zsc
@@ -236,7 +236,7 @@ extend Class SWWMHandler
 	override void WorldThingSpawned( WorldEvent e )
 	{
 		if ( profiling ) curms = MSTime();
-		if ( SuppressMultiItem(e) )
+		if ( !e.Thing || SuppressMultiItem(e) )
 		{
 			if ( profiling ) worldthingspawned_ms += MSTime()-curms;
 			return;