diff --git a/.vs/ja2_VS2019/FileContentIndex/1e8f8f28-b550-4c29-8eb1-eac938a509b6.vsidx b/.vs/ja2_VS2019/FileContentIndex/1e8f8f28-b550-4c29-8eb1-eac938a509b6.vsidx
new file mode 100644
index 000000000..d93907d26
Binary files /dev/null and b/.vs/ja2_VS2019/FileContentIndex/1e8f8f28-b550-4c29-8eb1-eac938a509b6.vsidx differ
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 6e3dbb745..99f52ce6d 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -55,8 +55,8 @@
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 10.10.22" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 22.11.04" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
-CHAR16		zRevisionNumber[16] = { L"Revision 9403" };
+CHAR16		zRevisionNumber[16] = { L"Revision 9404" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index e3fe1d3a8..64a5a4f4c 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -6603,12 +6603,18 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1
 		if ( Item[usWeaponIndex].usItemClass & IC_GUN )
 		{
 			PossiblyStartEnemyTaunt( this, TAUNT_GOT_HIT_GUNFIRE, ubAttackerID );
-			PossiblyStartEnemyTaunt( MercPtrs[ubAttackerID], TAUNT_HIT_GUNFIRE, this->ubID );
+			if (ubAttackerID != NOBODY)
+			{
+				PossiblyStartEnemyTaunt( MercPtrs[ubAttackerID], TAUNT_HIT_GUNFIRE, this->ubID );
+			}
 		}
 		else
 		{
 			PossiblyStartEnemyTaunt( this, TAUNT_GOT_HIT_THROWING_KNIFE, ubAttackerID );
-			PossiblyStartEnemyTaunt( MercPtrs[ubAttackerID], TAUNT_HIT_THROWING_KNIFE, this->ubID );
+			if (ubAttackerID != NOBODY)
+			{
+				PossiblyStartEnemyTaunt(MercPtrs[ubAttackerID], TAUNT_HIT_THROWING_KNIFE, this->ubID);
+			}
 		}
 	}
 	if ( Item[usWeaponIndex].usItemClass & IC_BLADE )