diff --git a/funcs/func_frame_drop.c b/funcs/func_frame_drop.c
index 0d679ad9fc..38c0d990d4 100644
--- a/funcs/func_frame_drop.c
+++ b/funcs/func_frame_drop.c
@@ -173,6 +173,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
 {
 	int i;
 	int drop_frame = 0;
+	char buf[64];
 	struct frame_drop_data *framedata = data;
 	if (!frame) {
 		return frame;
@@ -188,6 +189,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
 			if (frame->subclass.integer == controlframetype2str[i].type) {
 				if (framedata->controlvalues[i]) {
 					drop_frame = 1;
+					ast_frame_subclass2str(frame, buf, sizeof(buf), NULL, 0);
 				}
 				break;
 			}
@@ -197,6 +199,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
 			if (frame->frametype == frametype2str[i].type) {
 				if (framedata->values[i]) {
 					drop_frame = 1;
+					ast_frame_type2str(frame->frametype, buf, sizeof(buf));
 				}
 				break;
 			}
@@ -206,6 +209,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
 	if (drop_frame) {
 		ast_frfree(frame);
 		frame = &ast_null_frame;
+		ast_debug(2, "Dropping %s frame\n", buf);
 	}
 	return frame;
 }
diff --git a/main/channel.c b/main/channel.c
index 89b2867960..80a892a6a3 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2652,8 +2652,9 @@ int ast_raw_answer_with_stream_topology(struct ast_channel *chan, struct ast_str
 		ast_channel_unlock(chan);
 		break;
 	case AST_STATE_UP:
-		break;
+		/* Fall through */
 	default:
+		ast_debug(2, "Skipping answer, since channel state on %s is %s\n", ast_channel_name(chan), ast_state2str(ast_channel_state(chan)));
 		break;
 	}