diff --git a/Dotnet/AppApi/Cef/AppApiVrCef.cs b/Dotnet/AppApi/Cef/AppApiVrCef.cs
index 04524ec5..d56498d3 100644
--- a/Dotnet/AppApi/Cef/AppApiVrCef.cs
+++ b/Dotnet/AppApi/Cef/AppApiVrCef.cs
@@ -21,7 +21,7 @@ namespace VRCX
         public override void VrInit()
         {
             if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
-                MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vr.vrInit");
+                MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vr.vrInit");
         }
 
         public override void ToggleSystemMonitor(bool enabled)
diff --git a/Dotnet/AppApi/Cef/GameHandler.cs b/Dotnet/AppApi/Cef/GameHandler.cs
index 8d6d3a69..a91af0fc 100644
--- a/Dotnet/AppApi/Cef/GameHandler.cs
+++ b/Dotnet/AppApi/Cef/GameHandler.cs
@@ -36,7 +36,7 @@ namespace VRCX
 
             // TODO: fix this throwing an exception for being called before the browser is ready. somehow it gets past the checks
             if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
-                MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.game.updateIsGameRunning", isGameRunning, isSteamVRRunning, isHmdAfk);
+                MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.game.updateIsGameRunning", isGameRunning, isSteamVRRunning, isHmdAfk);
         }
 
         public override bool IsGameRunning()
diff --git a/Dotnet/Cef/CefCustomDragHandler.cs b/Dotnet/Cef/CefCustomDragHandler.cs
index 30283009..07b0a80e 100644
--- a/Dotnet/Cef/CefCustomDragHandler.cs
+++ b/Dotnet/Cef/CefCustomDragHandler.cs
@@ -24,9 +24,9 @@ namespace VRCX
                     dragData.Dispose();
                     return true;
                 }
-                
+
                 if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
-                    MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vrcx.dragEnterCef", file);
+                    MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vrcx.dragEnterCef", file);
 
                 dragData.Dispose();
                 return false;
diff --git a/Dotnet/Cef/MainForm.cs b/Dotnet/Cef/MainForm.cs
index ac7a8d6f..4265f4d5 100644
--- a/Dotnet/Cef/MainForm.cs
+++ b/Dotnet/Cef/MainForm.cs
@@ -86,7 +86,7 @@ namespace VRCX
             Browser.GotFocus += (_, _) =>
             {
                 if (Browser != null && !Browser.IsLoading && Browser.CanExecuteJavascriptInMainFrame)
-                    Browser.ExecuteScriptAsync("window?.$pinia.vrcStatus.onBrowserFocus");
+                    Browser.ExecuteScriptAsync("window?.$pinia?.vrcStatus?.onBrowserFocus");
             };
 
             JavascriptBindings.ApplyAppJavascriptBindings(Browser.JavascriptObjectRepository);
@@ -162,7 +162,7 @@ namespace VRCX
 
             if (WindowState != FormWindowState.Normal)
                 return;
-            
+
             LastSizeWidth = Size.Width;
             LastSizeHeight = Size.Height;
 
diff --git a/Dotnet/IPC/IPCClient.cs b/Dotnet/IPC/IPCClient.cs
index e7e101f9..ebd9f69d 100644
--- a/Dotnet/IPC/IPCClient.cs
+++ b/Dotnet/IPC/IPCClient.cs
@@ -90,7 +90,7 @@ namespace VRCX
 
 #if !LINUX
                         if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
-                            MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vrcx.ipcEvent", packet);
+                            MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vrcx.ipcEvent", packet);
 #endif
                     }
 
diff --git a/Dotnet/LogWatcher.cs b/Dotnet/LogWatcher.cs
index 88245bec..9700ccaf 100644
--- a/Dotnet/LogWatcher.cs
+++ b/Dotnet/LogWatcher.cs
@@ -297,7 +297,7 @@ namespace VRCX
                     m_LogQueue.Enqueue(logLine);
 #else
                     if (MainForm.Instance != null && MainForm.Instance.Browser != null)
-                        MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.gameLog.addGameLogEvent", logLine);
+                        MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.gameLog.addGameLogEvent", logLine);
 #endif
                 }
 
@@ -729,7 +729,7 @@ namespace VRCX
                 return false;
 
             var data = line.Substring(offset + 13);
-            
+
             // PWI, deprecated
             logger.Info("VRCX-World data: {0}", data);
             return true;