Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 20456)
+++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 20457)
@@ -1901,4 +1901,7 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2(Element* element){/*{{{*/
 
+	/* Check if ice in element */
+	if(!element->IsIceInElement()) return NULL;
+
 	/*compute all stiffness matrices for this element*/
 	ElementMatrix* Ke1=CreateKMatrixL1L2Viscous(element);
@@ -1982,4 +1985,7 @@
 }/*}}}*/
 ElementVector* StressbalanceAnalysis::CreatePVectorL1L2(Element* element){/*{{{*/
+
+	/* Check if ice in element */
+	if(!element->IsIceInElement()) return NULL;
 
 	/*Intermediaries*/
@@ -2969,4 +2975,7 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixFS(Element* element){/*{{{*/
 
+	/* Check if ice in element */
+	if(!element->IsIceInElement()) return NULL;
+
 	/*Get type of algorithm*/
 	int fe_FS;
@@ -3401,4 +3410,7 @@
 ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
 
+	/* Check if ice in element */
+	if(!element->IsIceInElement()) return NULL;
+
 	ElementVector* pe = NULL;
 
@@ -3686,6 +3698,8 @@
 ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
 
+	/* Check if ice in element */
+	if(!element->IsIceInElement()) return NULL;
+
 	ElementVector* pe = NULL;
-
 	int fe_FS;
 	element->FindParam(&fe_FS,FlowequationFeFSEnum);
Index: /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp	(revision 20456)
+++ /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp	(revision 20457)
@@ -66,8 +66,9 @@
 
 			if(analysis_type==StressbalanceAnalysisEnum){
-				bool isSIA,isSSA;
+				bool isSIA,isSSA,isL1L2;
 				femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
 				femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
-				if(isSIA || isSSA)
+				femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum);
+				if(isSIA || isSSA || isL1L2)
 					solvein2d=true;
 			}