diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index 09c67081f..f5b49c629 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -1525,7 +1525,7 @@ static const struct streamhandler *__determine_handler(struct packet_stream *in,
 		must_recrypt = 1;
 	else if (in->rtp_sinks.length > 1 || in->rtcp_sinks.length > 1) // need a proper decrypter?
 		must_recrypt = 1;
-	else if (in_proto->srtp && out_proto->srtp
+	else if (in_proto->srtp && out_proto && out_proto->srtp
 			&& in->selected_sfd && out && out->selected_sfd
 			&& (crypto_params_cmp(&in->crypto.params, &out->selected_sfd->crypto.params)
 				|| crypto_params_cmp(&out->crypto.params, &in->selected_sfd->crypto.params)))
diff --git a/recording-daemon/packet.c b/recording-daemon/packet.c
index 6a4cb1fb7..160a69901 100644
--- a/recording-daemon/packet.c
+++ b/recording-daemon/packet.c
@@ -178,8 +178,8 @@ out:
 	if (mf->recording_on && !ret->output && output_single) {
 		dbg("Metadata %s, output destination %s", mf->metadata, mf->output_dest);
 		if (mf->output_dest) {
-			char path[256];
-			strncpy(path, mf->output_dest, sizeof(path));
+			char path[PATH_MAX];
+			g_strlcpy(path, mf->output_dest, sizeof(path));
 			char *sep = strrchr(path, '/');
 			if (sep) {
 				char *filename = sep + 1;