diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
index 20463ca0..8938a317 100644
--- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
+++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("PepperDash Technology Corp")]
 [assembly: AssemblyProduct("PepperDashEssentials")]
 [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
-[assembly: AssemblyVersion("1.0.38.*")]
+[assembly: AssemblyVersion("1.0.39.*")]
 
diff --git a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
index 90618e92..03f619df 100644
--- a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
+++ b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
@@ -19,6 +19,8 @@ namespace PepperDash.Essentials
 {
     public class CotijaSystemController : Device
     {
+		int SseMessageLengthBeforeFailureCount;
+
         GenericHttpSseClient SseClient;
 
 		/// <summary>
@@ -452,9 +454,13 @@ namespace PepperDash.Essentials
 		/// <param name="content"></param>
 		void HandleHeartBeat(JToken content)
 		{
-			foreach (var b in RoomBridges)
+			var code = content["userCode"];
+			if(code != null) 
 			{
-				b.SetUserCode(content["userCode"].Value<string>());
+				foreach (var b in RoomBridges)
+				{
+					b.SetUserCode(code.Value<string>());
+				}
 			}
 			ResetOrStartHearbeatTimer();
 		}
@@ -468,6 +474,8 @@ namespace PepperDash.Essentials
         {
             if(e.Text.IndexOf("data:") > -1)
             {
+				SseMessageLengthBeforeFailureCount += e.Text.Length;
+
                 var message = e.Text.Substring(6);
 
                 Debug.Console(1, this, "Message RX: '{0}'", message);
@@ -582,7 +590,9 @@ namespace PepperDash.Essentials
                 }
                 catch (Exception err)
                 {
-                    Debug.Console(1, this, "Unable to parse message: {0}", err);
+					Debug.Console(1, "SseMessageLengthBeforeFailureCount: {0}", SseMessageLengthBeforeFailureCount);
+					SseMessageLengthBeforeFailureCount = 0;
+                    Debug.Console(1, this, "Unable to parse message: {0}", err);	
                 }
             }
         }
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index b7b39f0a..421c4c81 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index 808058fc..fd66bef9 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ
diff --git a/docs/PepperDash Essentials Installation v1.0.x.docx b/docs/PepperDash Essentials Installation v1.0.x.docx
index 7d8b71ab..45f34af6 100644
Binary files a/docs/PepperDash Essentials Installation v1.0.x.docx and b/docs/PepperDash Essentials Installation v1.0.x.docx differ