--- apps/app_directory.c.old	2020-11-19 07:39:40.000000000 -0500
+++ apps/app_directory.c	2020-12-08 16:43:20.821384135 -0500
@@ -295,6 +295,7 @@ static int play_mailbox_owner(struct ast
 	res = ast_app_sayname(chan, mailbox_id);
 	if (res >= 0) {
 		ast_stopstream(chan);
+		if (res > 0) return res;
 		/* If Option 'e' was specified, also read the extension number with the name */
 		if (ast_test_flag(flags, OPT_SAYEXTENSION)) {
 			ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY);
@@ -302,6 +303,8 @@ static int play_mailbox_owner(struct ast
 		}
 	} else {
 		res = ast_say_character_str(chan, S_OR(name, ext), AST_DIGIT_ANY, ast_channel_language(chan), AST_SAY_CASE_NONE);
+		if (res > 0) return res;
+		/* If Option 'e' was specified, also read the extension number with the name */
 		if (!ast_strlen_zero(name) && ast_test_flag(flags, OPT_SAYEXTENSION)) {
 			ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY);
 			res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, ast_channel_language(chan), AST_SAY_CASE_NONE);