diff --git a/JA2.suo b/JA2.suo
index 94cf2ade..127fb8e8 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp
index 9c2f2b2d..914be127 100644
--- a/Tactical/Boxing.cpp
+++ b/Tactical/Boxing.cpp
@@ -300,10 +300,15 @@ BOOLEAN CheckOnBoxers( void )
 		for( uiLoop = 0; uiLoop < NUM_BOXERS; uiLoop++ )
 		{
 			ubID = WhoIsThere2( gsBoxerGridNo[ uiLoop ], 0 );
-			if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT )
-			{	
-				// no weapon so this guy is a boxer
-				gubBoxerID[ uiLoop ] = ubID;
+
+			// WANNE: Safty check!
+			if (ubID < TOTAL_SOLDIERS)
+			{
+				if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT )
+				{	
+					// no weapon so this guy is a boxer
+					gubBoxerID[ uiLoop ] = ubID;
+				}
 			}
 		}
 	}