diff --git a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs
index 9669ca43..ce543885 100644
--- a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs
+++ b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs
@@ -104,7 +104,7 @@ namespace PepperDash.Essentials.Core
             Hardware.OnlineStatusChange += Hardware_OnlineStatusChange;
             CommunicationMonitor.Start();    
 
-			return true;
+			return base.CustomActivate();
 		}
 
 		/// <summary>
diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
index 8cf96cc5..cd75dcb7 100644
--- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
+++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
@@ -679,6 +679,14 @@ namespace PepperDash.Essentials.WebSocketServer
             }
 
             var values = s.Split(' ');
+
+            if(values.Length < 2)
+            {
+                CrestronConsole.ConsoleCommandResponse("Invalid number of arguments.  Please provide a room key and a grant code");
+                return;
+            }
+
+
             var roomKey = values[0];
             var grantCode = values[1];