@@ -738,13 +738,17 @@ void Mod::loadMod(const std::vector<std::string> &rulesetFiles, size_t modIdx)
 		if (!missions.empty())
 		{
 			std::set<std::string>::const_iterator j = missions.begin();
-			bool isSiteType = getAlienMission(*j) && getAlienMission(*j)->getObjective() == OBJECTIVE_SITE;
+			if (!getAlienMission(*j))
+			{
+				throw Exception("Error with MissionScript: " + (*i).first + ": alien mission type: " + *j + "not defined, do not incite the judgement of Amaunator."); 
+			}
+			bool isSiteType = getAlienMission(*j)->getObjective() == OBJECTIVE_SITE;
 			rule->setSiteType(isSiteType);
 			for (;j != missions.end(); ++j)
 			{
 				if (getAlienMission(*j) && (getAlienMission(*j)->getObjective() == OBJECTIVE_SITE) != isSiteType)
 				{
-					throw Exception("Error with MissionScript: " + (*i).first + " cannot mix terror/non-terror missions in a single command, so sayeth the wise Alaundo."); 
+					throw Exception("Error with MissionScript: " + (*i).first + ": cannot mix terror/non-terror missions in a single command, so sayeth the wise Alaundo."); 
 				}
 			}
 		}
Original file line number	Diff line number	Diff line change
`@@ -738,13 +738,17 @@ void Mod::loadMod(const std::vector<std::string> &rulesetFiles, size_t modIdx)`
`738`	`738`	`if (!missions.empty())`
`739`	`739`	`{`
`740`	`740`	`std::set<std::string>::const_iterator j = missions.begin();`
`741`		`- bool isSiteType = getAlienMission(j) && getAlienMission(j)->getObjective() == OBJECTIVE_SITE;`
	`741`	`+ if (!getAlienMission(*j))`
	`742`	`+ {`
	`743`	`+ throw Exception("Error with MissionScript: " + (i).first + ": alien mission type: " + j + "not defined, do not incite the judgement of Amaunator.");`
	`744`	`+ }`
	`745`	`+ bool isSiteType = getAlienMission(*j)->getObjective() == OBJECTIVE_SITE;`
`742`	`746`	`rule->setSiteType(isSiteType);`
`743`	`747`	`for (;j != missions.end(); ++j)`
`744`	`748`	`{`
`745`	`749`	`if (getAlienMission(j) && (getAlienMission(j)->getObjective() == OBJECTIVE_SITE) != isSiteType)`
`746`	`750`	`{`
`747`		`- throw Exception("Error with MissionScript: " + (*i).first + " cannot mix terror/non-terror missions in a single command, so sayeth the wise Alaundo.");`
	`751`	`+ throw Exception("Error with MissionScript: " + (*i).first + ": cannot mix terror/non-terror missions in a single command, so sayeth the wise Alaundo.");`
`748`	`752`	`}`
`749`	`753`	`}`
`750`	`754`	`}`