Index: /issm/trunk-jpl/src/m/os/issmscpin.py
===================================================================
--- /issm/trunk-jpl/src/m/os/issmscpin.py	(revision 13096)
+++ /issm/trunk-jpl/src/m/os/issmscpin.py	(revision 13097)
@@ -64,5 +64,4 @@
 				string=string[:-1]+'}'
 
-
 			if port:
 				subprocess.call('scp -P %d %s@localhost:%s %s' % (port,login,os.path.join(path,string),os.getcwd),shell=True)
Index: /issm/trunk-jpl/src/m/solve/WriteData.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 13096)
+++ /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 13097)
@@ -104,5 +104,8 @@
 			data=numpy.array([data])
 		if len(data.shape) == 1:
-			data=data.reshape(1,numpy.size(data,0))
+			if numpy.size(data):
+				data=data.reshape(numpy.size(data),1)
+			else:
+				data=data.reshape(0,0)
 
 		#Get size
@@ -132,5 +135,8 @@
 			data=numpy.array([data])
 		if len(data.shape) == 1:
-			data=data.reshape(1,numpy.size(data,0))
+			if numpy.size(data):
+				data=data.reshape(numpy.size(data),1)
+			else:
+				data=data.reshape(0,0)
 
 		#Get size
@@ -160,5 +166,8 @@
 			data=numpy.array([data])
 		if len(data.shape) == 1:
-			data=data.reshape(1,numpy.size(data,0))
+			if numpy.size(data):
+				data=data.reshape(numpy.size(data),1)
+			else:
+				data=data.reshape(0,0)
 
 		#Get size
@@ -191,5 +200,8 @@
 				matrix=numpy.array([matrix])
 			if len(matrix.shape) == 1:
-				matrix=matrix.reshape(1,numpy.size(matrix,0))
+				if numpy.size(matrix):
+					matrix=matrix.reshape(numpy.size(matrix),1)
+				else:
+					matrix=matrix.reshape(0,0)
 
 			s=matrix.shape
@@ -210,5 +222,5 @@
 				matrix=numpy.array([matrix])
 			if len(matrix.shape) == 1:
-				matrix=matrix.reshape(1,numpy.size(matrix,0))
+				matrix=matrix.reshape(numpy.size(matrix),1)
 
 			s=matrix.shape
Index: /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py	(revision 13096)
+++ /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py	(revision 13097)
@@ -27,4 +27,5 @@
 			if md.qmu.params['tabular_graphics_data']:
 				filelist.append('dakota_tabular.dat')
+	else:
 		filelist.append(md.miscellaneous.name+'.outbin')
 	cluster.Download(md.private.runtimename,filelist)
Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py	(revision 13096)
+++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py	(revision 13097)
@@ -19,5 +19,5 @@
 		#Check that file exists
 		if not os.path.exists(filename):
-			raise ValueError("binary file '%s' not found." % filename)
+			raise OSError("binary file '%s' not found." % filename)
 
 		#initialize md.results if not a structure yet
Index: /issm/trunk-jpl/src/m/solve/marshall.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.py	(revision 13096)
+++ /issm/trunk-jpl/src/m/solve/marshall.py	(revision 13097)
@@ -27,5 +27,6 @@
 	fields=vars(md)
 
-	for field in fields.iterkeys():
+#	for field in fields.iterkeys():
+	for field in ['mesh','mask','geometry','constants','surfaceforcings','basalforcings','materials','friction','flowequation','timestepping','initialization','rifts','debug','verbose','settings','solver','cluster','balancethickness','diagnostic','groundingline','hydrology','prognostic','thermal','steadystate','transient','autodiff','flaim','inversion','qmu','results','radaroverlay','miscellaneous','private']:
 
 		#Some properties do not need to be marshalled