Index: /issm/trunk-jpl/src/c/include/macros.h
===================================================================
--- /issm/trunk-jpl/src/c/include/macros.h	(revision 13530)
+++ /issm/trunk-jpl/src/c/include/macros.h	(revision 13531)
@@ -71,14 +71,14 @@
 #endif
 /*}}}*/
-/* IssmBoot/IssmEnd {{{*/
+/* ExceptionTrapBegin/ExceptionTrapEnd {{{*/
 
 /*The following macros hide the error exception handling in a matlab module. Just put 
- * IssmBoot(); and IssmEnd(); at the beginning and end of a module, and c++ exceptions 
+ * ExceptionTrapBegin(); and ExceptionTrapEnd(); at the beginning and end of a module, and c++ exceptions 
  * will be trapped. Really nifty!*/
 
-#define IssmBoot(); \
+#define ExceptionTrapBegin(); \
 	try{
 
-#define IssmEnd(); }\
+#define ExceptionTrapEnd(); }\
 	catch(ErrorException &exception){\
 		exception.Report(); \
Index: /issm/trunk-jpl/src/c/solutions/issm.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/issm.cpp	(revision 13530)
+++ /issm/trunk-jpl/src/c/solutions/issm.cpp	(revision 13531)
@@ -45,6 +45,8 @@
 	IssmPDouble Solution_time, Memory_use, Current_flops;
 
-	IssmBoot();
-
+	/*Initialize exception trapping: */
+	ExceptionTrapBegin();
+
+	/*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
 	EnvironmentInit(argc,argv);
 	
@@ -234,6 +236,6 @@
 	#endif
 
-	/*end module: */
-	IssmEnd();
+	/*Finalize exception trapping: */
+	ExceptionTrapEnd();
 
 	return 0; //unix success return;
Index: /issm/trunk-jpl/src/c/solutions/kriging.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/kriging.cpp	(revision 13530)
+++ /issm/trunk-jpl/src/c/solutions/kriging.cpp	(revision 13531)
@@ -36,6 +36,8 @@
 	IssmDouble *error       = NULL;
 
-	IssmBoot();
+	/*Initialize exception trapping: */
+	ExceptionTrapBegin();
 
+	/*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
 	EnvironmentInit(argc,argv);
 
@@ -97,6 +99,6 @@
 #endif
 
-	/*end module: */
-	IssmEnd();
+	/*Finalize exception trapping: */
+	ExceptionTrapEnd();
 
 	return 0; //unix success return;