Index: /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h
===================================================================
--- /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h	(revision 13230)
+++ /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h	(revision 13231)
@@ -19,11 +19,8 @@
 /*The following macros hide the error exception handling in a matlab module. Just put 
  * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
- * will be trapped. Really nifty!*/
-//exception.Report(); 
+ * will be trapped*/
+#define MODULEBOOT(); try{ 
 
-#define MODULEBOOT(); ModuleBoot(); \
-	try{
-
-#define MODULEEND(); ModuleEnd(); }\
+#define MODULEEND(); }\
 	catch(ErrorException &exception){\
 		mexErrMsgTxt("ISSM Error"); \
@@ -35,8 +32,7 @@
 		mexErrMsgTxt("An unexpected error occurred");\
 	}
-//}}}
+/*}}}*/
 /* WRAPPER {{{*/
 #define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) 
-
 /*}}}*/
 /* CHECKARGUMENTS {{{*/
Index: /issm/trunk-jpl/src/c/shared/Wrapper/ModuleBoot.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Wrapper/ModuleBoot.cpp	(revision 13230)
+++ /issm/trunk-jpl/src/c/shared/Wrapper/ModuleBoot.cpp	(revision 13231)
@@ -11,5 +11,4 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
 
 int ModuleBoot(void){