diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
index d71c274d255..af9d5a8be80 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -1073,7 +1073,7 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 					team->m_reinforcementID = unit->getID();
 				}
 				AIUpdateInterface *ai = unit->getAIUpdateInterface();
-				if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
+				if (team->m_team && team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
 					if (ai) {
 						std::vector<Coord3D> path;
 						path.push_back( *ai->getGoalPosition() );
@@ -2352,7 +2352,7 @@ void AIPlayer::queueUnits( void )
 			// the center of the team, or to the home area of this player?
 			Coord3D home = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 			Bool hasHome = false;
-			if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
+			if (team->m_team && team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
 				hasHome = true;
 			} else {
 				hasHome = getBaseCenter(&home);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
index f2e1e90e0fb..2e718f9f993 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -1080,7 +1080,7 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 					team->m_reinforcementID = unit->getID();
 				}
 				AIUpdateInterface *ai = unit->getAIUpdateInterface();
-				if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
+				if (team->m_team && team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
 					if (ai) {
 						std::vector<Coord3D> path;
 						path.push_back( *ai->getGoalPosition() );
@@ -2681,7 +2681,7 @@ void AIPlayer::queueUnits( void )
 			// the center of the team, or to the home area of this player?
 			Coord3D home = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 			Bool hasHome = false;
-			if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
+			if (team->m_team && team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
 				hasHome = true;
 			} else {
 				hasHome = getBaseCenter(&home);