diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 682ad5a4287d9127f0924705e535e707685ee2d3..9e8f8820bed6afeb2e13aeb0bd0630260985338d 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -672,14 +672,19 @@ static int acf_curl_helper(struct ast_channel *chan, struct curl_args *args)
 	}
 	AST_LIST_UNLOCK(&global_curl_info);
 
-	if (chan && (store = ast_channel_datastore_find(chan, &curl_info, NULL))) {
-		list = store->data;
-		AST_LIST_LOCK(list);
-		AST_LIST_TRAVERSE(list, cur, list) {
-			if (cur->key == CURLOPT_SPECIAL_HASHCOMPAT) {
-				hashcompat = (long) cur->value;
-			} else {
-				curl_easy_setopt(*curl, cur->key, cur->value);
+	if (chan) {
+		ast_channel_lock(chan);
+		store = ast_channel_datastore_find(chan, &curl_info, NULL);
+		ast_channel_unlock(chan);
+		if (store) {
+			list = store->data;
+			AST_LIST_LOCK(list);
+			AST_LIST_TRAVERSE(list, cur, list) {
+				if (cur->key == CURLOPT_SPECIAL_HASHCOMPAT) {
+					hashcompat = (long) cur->value;
+				} else {
+					curl_easy_setopt(*curl, cur->key, cur->value);
+				}
 			}
 		}
 	}
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index e0ba4a5a18ead90019942924b3014261cdbbc02f..ef7fe2a5efa73b0fe6590d9c3f51353e1e524f37 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -225,6 +225,9 @@ static int function_realtime_read(struct ast_channel *chan, const char *cmd, cha
 
 	if (resultslen > len) {
 		ast_log(LOG_WARNING, "Failed to fetch. Realtime data is too large: need %zu, have %zu.\n", resultslen, len);
+		if (chan) {
+			ast_autoservice_stop(chan);
+		}
 		return -1;
 	}
 
@@ -458,6 +461,9 @@ static int function_realtime_readdestroy(struct ast_channel *chan, const char *c
 			 * someones data without giving him the chance to look
 			 * at it. */
 			ast_log(LOG_WARNING, "Failed to fetch/destroy. Realtime data is too large: need %zu, have %zu.\n", resultslen, len);
+			if (chan) {
+				ast_autoservice_stop(chan);
+			}
 			return -1;
 		}
 
diff --git a/main/enum.c b/main/enum.c
index a44a60cbeb6959db61a937bd9118adb533a71384..8b6d3fe75953ec73b892d7791ce7888a860e1ece 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -941,10 +941,6 @@ int ast_get_txt(struct ast_channel *chan, const char *number, char *txt, int txt
 
 	ast_debug(4, "ast_get_txt: Number = '%s', suffix = '%s'\n", number, suffix);
 
-	if (chan && ast_autoservice_start(chan) < 0) {
-		return -1;
-	}
-
 	if (pos > 128) {
 		pos = 128;
 	}
@@ -965,9 +961,6 @@ int ast_get_txt(struct ast_channel *chan, const char *number, char *txt, int txt
 	} else {
 		ast_copy_string(txt, context.txt, txtlen);
 	}
-	if (chan) {
-		ret |= ast_autoservice_stop(chan);
-	}
 	return ret;
 }