diff --git a/renderdocui/Controls/TreeListView/TreeListNode.cs b/renderdocui/Controls/TreeListView/TreeListNode.cs
index dba4410c1..be9cc8844 100644
--- a/renderdocui/Controls/TreeListView/TreeListNode.cs
+++ b/renderdocui/Controls/TreeListView/TreeListNode.cs
@@ -222,6 +222,8 @@ namespace TreelistView
 			}
 			set
 			{
+				if (Owner == null)
+					return;
 				this[Owner.FieldIndex(fieldname)] = value;
 			}
 		}
diff --git a/renderdocui/Windows/MainWindow.cs b/renderdocui/Windows/MainWindow.cs
index 38247c8a7..5fba52b94 100644
--- a/renderdocui/Windows/MainWindow.cs
+++ b/renderdocui/Windows/MainWindow.cs
@@ -294,7 +294,7 @@ namespace renderdocui.Windows
             // perform a probe of known remote hosts to see if they're running or not
             if (!me.m_Core.LogLoading && !me.m_Core.LogLoaded)
             {
-                foreach (var host in me.m_Core.Config.RemoteHosts)
+                foreach (var host in me.m_Core.Config.RemoteHosts.ToArray())
                 {
                     // don't mess with a host we're connected to - this is handled anyway
                     if (host.Connected)