diff --git a/src/tools-source/cmd_wrapper.c b/src/tools-source/cmd_wrapper.c
index 1948047..b4d3874 100644
--- a/src/tools-source/cmd_wrapper.c
+++ b/src/tools-source/cmd_wrapper.c
@@ -3,7 +3,7 @@
  * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  *
  * Filename: src/tools-source/cmd_wrapper.c
- * Copyright (C) 2013 The OpenSDE Project
+ * Copyright (C) 2013 - 2015 The OpenSDE Project
  * Copyright (C) 2004 - 2006 The T2 SDE Project
  * Copyright (C) 1998 - 2003 Clifford Wolf
  *
@@ -281,7 +281,14 @@ int main(int argc, char ** argv) {
 		}
 		else {
 			other = strtok(other, ":");
-			setenv(ENVPREFIX "_WRAPPER_OTHERS_DONE", other, 1);
+			if ( other == NULL )
+			{
+				setenv(ENVPREFIX "_WRAPPER_OTHERS_DONE", "", 1);
+			}
+			else
+			{
+		        	setenv(ENVPREFIX "_WRAPPER_OTHERS_DONE", other, 1);
+			}
 		}
 	}