Index: /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp	(revision 24010)
+++ /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp	(revision 24011)
@@ -23,7 +23,11 @@
 	sprintf(toolkitoptions,"%s",options);
 }/*}}}*/
+void  ToolkitOptions::Init(){ /*{{{*/
+	toolkittype    = NULL;
+	toolkitoptions = NULL;
+}/*}}}*/
 char* ToolkitOptions::GetToolkitType(){  /*{{{*/
 
-	_assert_(toolkittype); 
+	if(toolkittype==NULL) _error_("toolkittype not set (may be a mex?)");
 	char* toolkittype_out = xNew<char>(strlen(toolkittype)+1); 
 	sprintf(toolkittype_out,"%s",toolkittype);
@@ -45,5 +49,5 @@
 
 	/*First, because tokenizing destroys a string, copy what we have: */
-	_assert_(tokenlist);
+	if(tokenlist==NULL) _error_("tokenlist not set (may be a mex?)");
 	tokenlistcopy= xNew<char>(strlen(tokenlist)+1); 
 	sprintf(tokenlistcopy,"%s",tokenlist);
Index: /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h	(revision 24010)
+++ /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h	(revision 24011)
@@ -15,5 +15,6 @@
 
 	public:
-		static void Init(const char* type_in,const char* options);
+		static void  Init(const char* type_in,const char* options);
+		static void  Init(void);
 		static char* GetToolkitType(void);
 		static char* GetToolkitOptionValue(const char* option);
Index: /issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h
===================================================================
--- /issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h	(revision 24010)
+++ /issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h	(revision 24011)
@@ -17,8 +17,8 @@
 #endif
 
-#include "../bindings.h"
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/shared/shared.h"
+#include "../bindings.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h	(revision 24010)
+++ /issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h	(revision 24011)
@@ -19,5 +19,6 @@
  * will be trapped*/
 #define MODULEBOOT(); try{ \
-	IssmComm::SetComm();
+	IssmComm::SetComm(); \
+	ToolkitOptions::Init();
 
 #define MODULEEND(); }\