diff --git a/language.version b/language.version
index 54848c09d..6b8318077 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r505 (Sun 23 Aug 16:32:44 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r505 (Fri 28 Aug 09:50:34 CEST 2020)";
diff --git a/zscript/swwm_ammo.zsc b/zscript/swwm_ammo.zsc
index e4b8c8d2e..cc27dcdae 100644
--- a/zscript/swwm_ammo.zsc
+++ b/zscript/swwm_ammo.zsc
@@ -235,6 +235,17 @@ Class MagAmmo : Inventory abstract
 
 	bool MagFill()
 	{
+		// double-check that parent ammo exists
+		if ( !pamo )
+		{
+			pamo = Ammo(Owner.FindInventory(ParentAmmo));
+			if ( !pamo )
+			{
+				pamo = Ammo(Spawn(ParentAmmo));
+				pamo.AttachToOwner(Owner);
+				pamo.Amount = 0;
+			}
+		}
 		bool given = false;
 		while ( (pamo.Amount < pamo.MaxAmount) && (Amount >= ClipSize) )
 		{
diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc
index d20653637..ccbe83d14 100644
--- a/zscript/swwm_handler.zsc
+++ b/zscript/swwm_handler.zsc
@@ -92,7 +92,7 @@ Class SWWMCrashHandler : StaticEventHandler
 				let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler"));
 				if ( hnd && hnd.detected ) Console.Printf(TEXTCOLOR_GOLD.."Don't blame me. Shouldn't have tried running this with Brutal Doom."..TEXTCOLOR_NORMAL);
 				else Console.Printf(TEXTCOLOR_GOLD.."If you didn't trigger it manually, it's best if you take a screenshot and show it to Marisa."..TEXTCOLOR_NORMAL);
-				Console.Printf(TEXTCOLOR_GOLD.."Version Information: %s"..TEXTCOLOR_NORMAL,StringTable.Localize("SWWM_MODVER"));
+				Console.Printf(TEXTCOLOR_GOLD.."Version Information: %s"..TEXTCOLOR_NORMAL,StringTable.Localize("$SWWM_MODVER"));
 			}
 			timer++;
 		}