diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj.filters b/libs/spandsp/src/libspandsp.2012.vcxproj.filters
index dea495c328..bc694efb84 100644
--- a/libs/spandsp/src/libspandsp.2012.vcxproj.filters
+++ b/libs/spandsp/src/libspandsp.2012.vcxproj.filters
@@ -696,8 +696,12 @@
     <ClInclude Include="spandsp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="spandsp\t4_t6_decode.h" />
-    <ClInclude Include="spandsp\t4_t6_encode.h" />
+    <ClInclude Include="spandsp\t4_t6_decode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="spandsp\t4_t6_encode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="spandsp\ademco_contactid.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/src/mod/applications/mod_spandsp/udptl.c b/src/mod/applications/mod_spandsp/udptl.c
index 9de1a915cc..45fa6b6ffc 100644
--- a/src/mod/applications/mod_spandsp/udptl.c
+++ b/src/mod/applications/mod_spandsp/udptl.c
@@ -205,7 +205,8 @@ int udptl_rx_packet(udptl_state_t *s, const uint8_t buf[], int len)
 	/* Save the new packet. Pure redundancy mode won't use this, but some systems will switch
 	   into FEC mode after sending some redundant packets. */
 	x = seq_no & UDPTL_BUF_MASK;
-	memcpy(s->rx[x].buf, msg, msg_len);
+    if (msg_len > 0)
+    	memcpy(s->rx[x].buf, msg, msg_len);
 	s->rx[x].buf_len = msg_len;
 	s->rx[x].fec_len[0] = 0;
 	s->rx[x].fec_span = 0;
@@ -288,7 +289,8 @@ int udptl_rx_packet(udptl_state_t *s, const uint8_t buf[], int len)
 				return -1;
 
 			/* Save the new FEC data */
-			memcpy(s->rx[x].fec[i], data, s->rx[x].fec_len[i]);
+            if (s->rx[x].fec_len[i])
+    			memcpy(s->rx[x].fec[i], data, s->rx[x].fec_len[i]);
 #if 0
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FEC: ");
 			for (j = 0; j < s->rx[x].fec_len[i]; j++)