diff --git a/TSVN/TSVNToolWindowControl.xaml.cs b/TSVN/TSVNToolWindowControl.xaml.cs
index c34171c..c450b10 100644
--- a/TSVN/TSVNToolWindowControl.xaml.cs
+++ b/TSVN/TSVNToolWindowControl.xaml.cs
@@ -76,7 +76,7 @@ private void ProcessChange(TSVNTreeViewFolderItem root, string solutionDir, stri
             var path = change.Substring(8);
             var pathParts = path.Split('\\');
 
-            for (int i = 0; i < pathParts.Length; i++)
+            for (var i = 0; i < pathParts.Length; i++)
             {
                 var item = FindItem(root, pathParts[i]);
                 if (item == null)
@@ -93,9 +93,9 @@ private void ProcessChange(TSVNTreeViewFolderItem root, string solutionDir, stri
                         
                     root.Items.Add(newItem);
                 }
-                else
+                else if (item is TSVNTreeViewFolderItem folderItem)
                 {
-                    root = (TSVNTreeViewFolderItem)item;
+                    root = folderItem;
                 }
             }
         }