diff --git a/QSB/Events/PlayerState.cs b/QSB/Events/PlayerState.cs
index fb13752f..f4fdaa63 100644
--- a/QSB/Events/PlayerState.cs
+++ b/QSB/Events/PlayerState.cs
@@ -20,7 +20,7 @@ namespace QSB.Events
 
         private void OnClientReceiveMessage(PlayerStateMessage message)
         {
-            if (message.FromId == PlayerRegistry.LocalPlayerId)
+            if (message.AboutId == PlayerRegistry.LocalPlayerId)
             {
                 return;
             }
diff --git a/QSB/PlayerInfo.cs b/QSB/PlayerInfo.cs
index a89b0db1..b7dee796 100644
--- a/QSB/PlayerInfo.cs
+++ b/QSB/PlayerInfo.cs
@@ -12,7 +12,7 @@ namespace QSB
         public GameObject Camera { get; set; }
         public GameObject ProbeBody { get; set; }
         public QSBProbe Probe { get; set; }
-        public QSBFlashlight FlashLight => Camera.GetComponentInChildren<QSBFlashlight>();
+        public QSBFlashlight FlashLight => Camera?.GetComponentInChildren<QSBFlashlight>();
         public QSBTool Signalscope => GetToolByType(ToolType.Signalscope);
         public QSBTool Translator => GetToolByType(ToolType.Translator);
         public QSBTool ProbeLauncher => GetToolByType(ToolType.ProbeLauncher);