diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.c b/src/mod/endpoints/mod_rtmp/mod_rtmp.c
index 45daf7bfea..ae3b3a6279 100644
--- a/src/mod/endpoints/mod_rtmp/mod_rtmp.c
+++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.c
@@ -515,13 +515,13 @@ switch_status_t rtmp_receive_message(switch_core_session_t *session, switch_core
 			const char *name = msg->string_array_arg[0], *number = msg->string_array_arg[1];
 			char *arg = NULL;
 			char *argv[2] = { 0 };
-			int argc;
+			//int argc;
 
 			if (zstr(name) && !zstr(msg->string_arg)) {
 				arg = strdup(msg->string_arg);
 				switch_assert(arg);
 
-				argc = switch_separate_string(arg, '|', argv, (sizeof(argv) / sizeof(argv[0])));
+				switch_separate_string(arg, '|', argv, (sizeof(argv) / sizeof(argv[0])));
 				name = argv[0];
 				number = argv[1];
 
diff --git a/src/mod/endpoints/mod_rtmp/rtmp.c b/src/mod/endpoints/mod_rtmp/rtmp.c
index cb104c3908..24900a408c 100644
--- a/src/mod/endpoints/mod_rtmp/rtmp.c
+++ b/src/mod/endpoints/mod_rtmp/rtmp.c
@@ -639,7 +639,7 @@ switch_status_t rtmp_send_message(rtmp_session_t *rsession, uint8_t amfnumber, u
 	}
 end:
 	switch_mutex_unlock(rsession->socket_mutex);
-	return SWITCH_STATUS_SUCCESS;
+	return status;
 }
 
 /* Returns SWITCH_STATUS_SUCCESS of the connection is still active or SWITCH_STATUS_FALSE to tear it down */