X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=homovacommand.cpp;fp=homovacommand.cpp;h=18690048c712c69bad1b1e9aa44c4e6b64a8cee9;hp=22fd1bff1b0af5ac23532423f7b42471e1b6b3b3;hb=ae57e166b2ed7b475ec3f466106bd76fabadd063;hpb=55386dddad84cc1140d736cabaf4dd0ae16f2e01

diff --git a/homovacommand.cpp b/homovacommand.cpp
index 22fd1bf..1869004 100644
--- a/homovacommand.cpp
+++ b/homovacommand.cpp
@@ -178,10 +178,16 @@ int HomovaCommand::execute(){
 		//link designMap to rows/columns in distance matrix
 		map<string, vector<int> > origGroupSampleMap;
 		for(int i=0;i<sampleNames.size();i++){
-			origGroupSampleMap[designMap->getGroup(sampleNames[i])].push_back(i);
+			string group = designMap->getGroup(sampleNames[i]);
+			
+			if (group == "not found") {
+				m->mothurOut("[ERROR]: " + sampleNames[i] + " is not in your design file, please correct."); m->mothurOutEndLine(); m->control_pressed = true;
+			}else { origGroupSampleMap[group].push_back(i); }
 		}
 		int numGroups = origGroupSampleMap.size();
 		
+		if (m->control_pressed) { delete designMap; return 0; }
+		
 		//create a new filename
 		ofstream HOMOVAFile;
 		string HOMOVAFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName))  + "homova";