Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision d55d7a68246b165aeaa9e161109032ddd07146d8)
+++ src/GenPoly/Box.cc	(revision 1f37ed02cc74c64f4e7f522e805e7b6fba4e51ee)
@@ -215,5 +215,5 @@
 	inline void mutateTranslationUnit( std::list< Declaration* > &translationUnit, MutatorType &mutator ) {
 		bool seenIntrinsic = false;
-		SemanticError errors;
+		SemanticErrorException errors;
 		for ( typename std::list< Declaration* >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
 			try {
@@ -228,5 +228,5 @@
 					assert( *i );
 				} // if
-			} catch( SemanticError &e ) {
+			} catch( SemanticErrorException &e ) {
 				errors.append( e );
 			} // try
@@ -575,5 +575,5 @@
 						}
 					} else {
-						throw SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " );
+						SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " );
 					}
 				}
@@ -597,5 +597,5 @@
 					} else {
 						// xxx - should this be an assertion?
-						throw SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) );
+						SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) );
 					} // if
 				} // if
Index: src/GenPoly/FindFunction.cc
===================================================================
--- src/GenPoly/FindFunction.cc	(revision d55d7a68246b165aeaa9e161109032ddd07146d8)
+++ src/GenPoly/FindFunction.cc	(revision 1f37ed02cc74c64f4e7f522e805e7b6fba4e51ee)
@@ -19,5 +19,4 @@
 
 #include "Common/PassVisitor.h"         // for PassVisitor
-#include "Common/SemanticError.h"       // for SemanticError
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::iterator
 #include "GenPoly/GenPoly.h"            // for TyVarMap
Index: src/GenPoly/InstantiateGeneric.cc
===================================================================
--- src/GenPoly/InstantiateGeneric.cc	(revision d55d7a68246b165aeaa9e161109032ddd07146d8)
+++ src/GenPoly/InstantiateGeneric.cc	(revision 1f37ed02cc74c64f4e7f522e805e7b6fba4e51ee)
@@ -24,5 +24,4 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for deleteAll, cloneAll
Index: src/GenPoly/Lvalue.cc
===================================================================
--- src/GenPoly/Lvalue.cc	(revision d55d7a68246b165aeaa9e161109032ddd07146d8)
+++ src/GenPoly/Lvalue.cc	(revision 1f37ed02cc74c64f4e7f522e805e7b6fba4e51ee)
@@ -18,5 +18,4 @@
 
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "GenPoly.h"                     // for isPolyType
 #include "Lvalue.h"
Index: src/GenPoly/Specialize.cc
===================================================================
--- src/GenPoly/Specialize.cc	(revision d55d7a68246b165aeaa9e161109032ddd07146d8)
+++ src/GenPoly/Specialize.cc	(revision 1f37ed02cc74c64f4e7f522e805e7b6fba4e51ee)
@@ -23,5 +23,4 @@
 
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "Common/UniqueName.h"           // for UniqueName
 #include "Common/utility.h"              // for group_iterate