Index: /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h	(revision 25524)
+++ /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h	(revision 25525)
@@ -52,6 +52,5 @@
 		}
 		void call(char* & value){
-			int size = 0;
-			if(value) size = strlen(value)+1;
+			int size = strlen(value)+1;
 			this->call(size);
 			this->call(value,size);
@@ -116,8 +115,7 @@
 		}
 		void call(char* & value){
-			int size = 0;
-			if(value) size = strlen(value)+1;
+			int size = strlen(value)+1;
 			this->call(size);
-			if(size) marshalled_data_size+=size*sizeof(char);
+			this->call(value,size);
 		};
 		template<typename T> void call(T* & value,int size){