diff --git a/res/res_agi.c b/res/res_agi.c
index e5b62fe589..13fe232249 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2077,8 +2077,11 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
 
 static int agi_exec(struct ast_channel *chan, void *data)
 {
-	if (chan->_softhangup)
-		ast_log(LOG_WARNING, "If you want to run AGI on hungup channels you should use DeadAGI!\n");
+	if (ast_check_hangup(chan)) {
+		ast_log(LOG_ERROR, "If you want to run AGI on hungup channels you should use DeadAGI!\n");
+		return 0;
+	}
+	
 	return agi_exec_full(chan, data, 0, 0);
 }
 
@@ -2086,8 +2089,10 @@ static int eagi_exec(struct ast_channel *chan, void *data)
 {
 	int readformat, res;
 
-	if (chan->_softhangup)
-		ast_log(LOG_WARNING, "If you want to run AGI on hungup channels you should use DeadAGI!\n");
+	if (ast_check_hangup(chan)) {
+		ast_log(LOG_ERROR, "If you want to run AGI on hungup channels you should use DeadAGI!\n");
+		return 0;
+	}
 	readformat = chan->readformat;
 	if (ast_set_read_format(chan, AST_FORMAT_SLINEAR)) {
 		ast_log(LOG_WARNING, "Unable to set channel '%s' to linear mode\n", chan->name);
@@ -2104,6 +2109,10 @@ static int eagi_exec(struct ast_channel *chan, void *data)
 
 static int deadagi_exec(struct ast_channel *chan, void *data)
 {
+	if (!ast_check_hangup(chan)) {
+		ast_log(LOG_ERROR,"Running DeadAGI on a live channel is not permitted, please use AGI\n");
+		return 0;
+	}
 	return agi_exec_full(chan, data, 0, 1);
 }