diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 7701ce6c..e35a98a5 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -3180,7 +3180,12 @@ void InternalSelectSoldier( UINT16 usSoldierID, BOOLEAN fAcknowledge, BOOLEAN fF
     // find which squad this guy is, then set selected squad to this guy
 	if( pSoldier->bAssignment == VEHICLE )
 	{
-		SetCurrentSquad( GetSoldierStructureForVehicle(pSoldier->iVehicleId)->bAssignment, FALSE );	
+		SOLDIERTYPE* pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
+
+		if ( pVehicle )
+			SetCurrentSquad( pVehicle->bAssignment, FALSE );
+		else
+			SetCurrentSquad( pSoldier->bAssignment, FALSE );
 	}
 	else
 	{