Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r0d62a88fffca17d0ccc398cd70b4e28d65a0e52d -r619575b2af1dc2df7a7960871402ef41234eb417
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r0d62a88fffca17d0ccc398cd70b4e28d65a0e52d -r619575b2af1dc2df7a7960871402ef41234eb417
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r9f7654858183353bddf5f412a2f23b386a9862cb -r619575b2af1dc2df7a7960871402ef41234eb417
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 9f7654858183353bddf5f412a2f23b386a9862cb)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 619575b2af1dc2df7a7960871402ef41234eb417)
@@ -1165,8 +1165,10 @@
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm);
 		
-		if(branches.myBranches.length > 0)
-			evt.target.scrollContent.branches = getValidBranches(branches.myBranches);
+		var validBranches:Array = getValidBranches(branches.myBranches);
+		
+		if(validBranches.length > 0)
+			evt.target.scrollContent.branches = validBranches;
 		else
 			evt.target.scrollContent.sequences = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID);
 			
@@ -1191,8 +1193,10 @@
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.conditions = conditions;
 		
+		var validBranches:Array = getValidBranches(branches.myBranches);
+		
 		if(branches.myBranches.length > 0)
-			evt.target.scrollContent.branches = getValidBranches(branches.myBranches);
+			evt.target.scrollContent.branches = validBranches;
 		else
 			evt.target.scrollContent.sequences = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID);