diff --git a/renderdocui/Code/Cameras.cs b/renderdocui/Code/Cameras.cs
index e54a904f3..83e50081a 100644
--- a/renderdocui/Code/Cameras.cs
+++ b/renderdocui/Code/Cameras.cs
@@ -55,8 +55,6 @@ namespace renderdocui.Code
 
             var me = (TimedUpdate)state;
 
-            if (me == null) return;
-
             if (me.m_Update != null) me.m_Update();
             if (me.m_CameraTick != null) me.m_CameraTick.Change(me.m_Rate, System.Threading.Timeout.Infinite);
         }
diff --git a/renderdocui/Interop/ReplayRenderer.cs b/renderdocui/Interop/ReplayRenderer.cs
index fd28c5dbb..4be733caf 100644
--- a/renderdocui/Interop/ReplayRenderer.cs
+++ b/renderdocui/Interop/ReplayRenderer.cs
@@ -1233,6 +1233,9 @@ namespace renderdoc
                     CustomMarshal.Free(mem);
                 }
 
+                if (msg == null)
+                    return;
+
                 if (msg.Type == TargetControlMessageType.Disconnected)
                 {
                     m_Connected = false;