@@ -102,7 +102,7 @@ void NewResearchListState::onSelectProject(Action *)
 {
 	_game->pushState(new ResearchInfoState(_game, _base, _projects[_lstResearch->getSelectedRow()]));
 	RuleResearch *_proj = _projects[_lstResearch->getSelectedRow()];
-	if((_proj)->needItem())
+	if ((_proj)->needItem() && _game->getRuleset()->getUnit(_proj->getName()))
 	{
 		_base->getItems()->removeItem(_proj->getName(), 1);
 	}
 
@@ -1072,7 +1072,8 @@ RuleSoldier *Ruleset::getSoldier(const std::string &name) const
  */
 Unit *Ruleset::getUnit(const std::string &name) const
 {
-	return _units.find(name)->second;
+	std::map<std::string, Unit*>::const_iterator i = _units.find(name);
+	if (_units.end() != i) return i->second; else return 0;
 }
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void NewResearchListState::onSelectProject(Action *)`
`102`	`102`	`{`
`103`	`103`	`_game->pushState(new ResearchInfoState(_game, _base, _projects[_lstResearch->getSelectedRow()]));`
`104`	`104`	`RuleResearch *_proj = _projects[_lstResearch->getSelectedRow()];`
`105`		`- if((_proj)->needItem())`
	`105`	`+ if ((_proj)->needItem() && _game->getRuleset()->getUnit(_proj->getName()))`
`106`	`106`	`{`
`107`	`107`	`_base->getItems()->removeItem(_proj->getName(), 1);`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,8 @@ RuleSoldier *Ruleset::getSoldier(const std::string &name) const`
`1072`	`1072`	`*/`
`1073`	`1073`	`Unit *Ruleset::getUnit(const std::string &name) const`
`1074`	`1074`	`{`
`1075`		`- return _units.find(name)->second;`
	`1075`	`+ std::map<std::string, Unit*>::const_iterator i = _units.find(name);`
	`1076`	`+ if (_units.end() != i) return i->second; else return 0;`
`1076`	`1077`	`}`
`1077`	`1078`
`1078`	`1079`	`/**`