diff --git a/PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs b/PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs
index 549bf17b..a54a9b9f 100644
--- a/PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs
+++ b/PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs
@@ -34,7 +34,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         void GetConfigFile(string url)
         {
-            url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid);
+            try
+            {
+                var parser = new Crestron.SimplSharp.Net.Http.UrlParser(url);
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully parsed URL from AppServer message: {0}", parser.Url);
+            }
+            catch
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to parse URL from AppServer message.  Generating URL from config data");
+                url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid);
+            }
 
             ConfigUpdater.GetConfigFromServer(url);
         }
diff --git a/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs b/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
index 7b56ab29..12107ff5 100644
--- a/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
+++ b/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
@@ -40,8 +40,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="e"></param>
         void ProgramInfoChanged(object sender, ProgramInfoEventArgs e)
         {
-            Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
-            PostStatusMessage(e.ProgramInfo);
+            if (e.ProgramInfo != null)
+            {
+                //Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
+                PostStatusMessage(e.ProgramInfo);
+            }
         }
 
         /// <summary>
diff --git a/essentials-framework b/essentials-framework
index e1f26dc6..1393abd8 160000
--- a/essentials-framework
+++ b/essentials-framework
@@ -1 +1 @@
-Subproject commit e1f26dc6e005cf4cd2e2401564dfb61b504f6b72
+Subproject commit 1393abd812273e57b2802837331c23be5ccaf5a8