From c3d097140d89959ab88424857208118817bc4898 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Sat, 27 May 2006 23:34:09 +0000
Subject: [PATCH] used popError() on two cases where errors are caught and delt
 with.

---
 Cantera/src/SpeciesThermoFactory.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cantera/src/SpeciesThermoFactory.cpp b/Cantera/src/SpeciesThermoFactory.cpp
index 867a0e1a1..95bf505c0 100755
--- a/Cantera/src/SpeciesThermoFactory.cpp
+++ b/Cantera/src/SpeciesThermoFactory.cpp
@@ -74,10 +74,10 @@ namespace Cantera {
     SpeciesThermo* SpeciesThermoFactory::newSpeciesThermo(XML_Node* node) {
         int inasa = 0, ishomate = 0, isimple = 0, iother = 0;
 	try {
-            getSpeciesThermoTypes(node, inasa, ishomate, isimple, iother);
-	} 
-        catch (UnknownSpeciesThermoModel) {
-            iother = 1;
+	  getSpeciesThermoTypes(node, inasa, ishomate, isimple, iother);
+	} catch (UnknownSpeciesThermoModel) {
+	  iother = 1;
+	  popError();
 	}
 	if (iother) {
             writelog("returning new GeneralSpeciesThermo");
@@ -96,10 +96,10 @@ namespace Cantera {
             getSpeciesThermoTypes(nodes[j], inasa, ishomate, isimple, iother);
 	  } catch (UnknownSpeciesThermoModel) {
 	    iother = 1;
+	    popError();
 	  }
         }
 	if (iother) {
-            writelog("returning new GeneralSpeciesThermo");
 	  return new GeneralSpeciesThermo();
 	}
         return newSpeciesThermo(NASA*inasa
@@ -123,7 +123,6 @@ namespace Cantera {
 	  }
         }
 	if (iother) {
-            writelog("returning new GeneralSpeciesThermo");
 	  return new GeneralSpeciesThermo();
 	}
         return newSpeciesThermo(NASA*inasa