diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 3bc7c21..904f87a 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -432,7 +432,7 @@ namespace PepperDash.Core
                 if (Client != null)
                 {
                     if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                        Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+                        Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
 
                     TheStream.Write(text);
                     TheStream.Flush();
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index f151b57..9f2102b 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -376,7 +376,7 @@ namespace PepperDash.Core
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
 			// Check debug level before processing byte array
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
             if(Client != null)
 			    Client.SendData(bytes, bytes.Length);
 
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs
index 1ed3d68..81cf4a2 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs	
@@ -329,7 +329,7 @@ namespace PepperDash.Core
             if (IsConnected && Server != null)
             {
                 if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
 
                 Server.SendData(bytes, bytes.Length);
             }
diff --git a/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs b/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs
index c5892a4..9dc4b48 100644
--- a/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs	
+++ b/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs	
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
-
+using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -138,5 +138,10 @@ namespace PepperDash.Core
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
 			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
 		}
+
+        public static string GetDebugText(string text)
+        {
+            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+        }
 	}
 }
\ No newline at end of file