diff --git a/src/Vixen.Application/Setup/SetupPatchingSimple.cs b/src/Vixen.Application/Setup/SetupPatchingSimple.cs
index e2487e178..099e67a8c 100644
--- a/src/Vixen.Application/Setup/SetupPatchingSimple.cs
+++ b/src/Vixen.Application/Setup/SetupPatchingSimple.cs
@@ -357,7 +357,7 @@ private void _updateControllerDetails(ControllersAndOutputsSet controllersAndOut
 
 				foreach (int outputIndex in controllersAndOutput.Value)
 				{
-					if (outputIndex > controller.Outputs.Length)
+					if (outputIndex >= controller.Outputs.Length)
 					{
 						Logging.Warn("passed an output index greater than the controller output length: " + controller.Name + ", " + outputIndex);
 						continue;
diff --git a/src/Vixen.Common/Controls/ControllerTree.cs b/src/Vixen.Common/Controls/ControllerTree.cs
index 8348863c7..7e8e6a651 100644
--- a/src/Vixen.Common/Controls/ControllerTree.cs
+++ b/src/Vixen.Common/Controls/ControllerTree.cs
@@ -646,7 +646,7 @@ public bool RemoveSelectedOutputs()
 						VixenSystem.OutputControllers.Resume(controllerOutputs.Key);
 					}
 				}
-
+				treeview.ClearSelectedNodes();
 				OnControllersChanged();
 				PopulateControllerTree();
 				if (TopLevelControl != null)