diff --git a/ChangeLog b/ChangeLog
index 96320a6f58..8f8c5dfe82 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Josh Roberson <josh@asteirasgi.com>
+	
+	* Fix crash on variable passing from AMI originate (issue #5737)
+
 2005-11-14  Russell Bryant  <russell@digium.com>
 
 	* many files: Merge doxygen documentation updates. (issue #5605)
diff --git a/manager.c b/manager.c
index 1be1a38dc7..629cad2131 100755
--- a/manager.c
+++ b/manager.c
@@ -329,9 +329,11 @@ struct ast_variable *astman_get_variables(struct message *m)
 		if (!(var = ast_strdupa(m->headers[x] + varlen)))
 			return head;
 
-		if ((var_count = ast_app_separate_args(var, '|', vars, sizeof(vars) / sizeof(var[0])))) {
+		if ((var_count = ast_app_separate_args(var, '|', vars, sizeof(vars) / sizeof(vars[0])))) {
 			for (y = 0; y < var_count; y++) {
-				var = val = vars[y];
+				if (!vars[y])
+					continue;
+				var = val = ast_strdupa(vars[y]);
 				strsep(&val, "=");
 				if (!val || ast_strlen_zero(var))
 					continue;