diff --git a/res/res_agi.c b/res/res_agi.c
index 1624e5455d0c60d72c28a53fd7a9d257d897da6f..64c0390ebbea9404a90ee70ee209e84d56bc7363 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -547,9 +547,14 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
 	struct ast_filestream *vfs;
 	long sample_offset = 0;
 	long max_length;
+	char *edigits = "";
 
 	if (argc < 4 || argc > 5)
 		return RESULT_SHOWUSAGE;
+
+	if (argv[3]) 
+		edigits = argv[3];
+
 	if ((argc > 4) && (sscanf(argv[4], "%ld", &sample_offset) != 1))
 		return RESULT_SHOWUSAGE;
 	
@@ -563,6 +568,9 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
 	if (vfs)
 		ast_log(LOG_DEBUG, "Ooh, found a video stream, too\n");
 		
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (escape_digits=%s) (sample_offset %ld)\n", argv[2], edigits, sample_offset);
+
 	ast_seekstream(fs, 0, SEEK_END);
 	max_length = ast_tellstream(fs);
 	ast_seekstream(fs, sample_offset, SEEK_SET);
@@ -600,7 +608,7 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *
 	long sample_offset = 0;
 	long max_length;
 	int timeout = 0;
-	char *edigits = NULL;
+	char *edigits = "";
 
 	if ( argc < 4 || argc > 5 )
 		return RESULT_SHOWUSAGE;