diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 92d0b9729e2b0a2753d8fc7b6066d607d0eee988..d6c440257ec02ffe0c8dee4c37507958e1cef1ce 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -529,8 +529,11 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
 			struct ast_str *fields = ast_str_create(ast_str_strlen(str) / 2);
 			struct ast_str *values = ast_str_create(ast_str_strlen(str) / 2);
 			int rowcount = 0;
-			while ((piece = strsep(&remainder, "&"))) {
+			while (fields && values && (piece = strsep(&remainder, "&"))) {
 				char *name = strsep(&piece, "=");
+				if (!piece) {
+					piece = "";
+				}
 				ast_uri_decode(piece);
 				ast_uri_decode(name);
 				ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name);