Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r8cd5415d7ec415eb2591bfae35a8e484e5fa99e9 -r3029038bc804418124ff5e6ba6534a03a3382581
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r8cd5415d7ec415eb2591bfae35a8e484e5fa99e9 -r3029038bc804418124ff5e6ba6534a03a3382581
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -rbcf9450991007fe65f3b373b83da167905ba3fd0 -r3029038bc804418124ff5e6ba6534a03a3382581
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision bcf9450991007fe65f3b373b83da167905ba3fd0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
@@ -145,7 +145,7 @@
 	
 	public function set defaultBranch(a:Branch) {
 		_defaultBranch = a;
-		_firstActivityUIID = SequenceActivity(a.sequenceActivity).activityUIID;
+		_firstActivityUIID = (a != null) ? SequenceActivity(a.sequenceActivity).activityUIID : null;
 	}
 	
 	public function get defaultBranch():Branch {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e -r3029038bc804418124ff5e6ba6534a03a3382581
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
@@ -273,8 +273,8 @@
 		var keyArray:Array = _branches.keys();
 		for(var i=0; i<keyArray.length; i++){
 			var branch:Branch = Branch(_branches.get(keyArray[i]));
-			if(branch.targetUIID == connectUIID) {
-				if(activity.firstActivityUIID == branch.sequenceActivity.activityUIID && branch.isStart)
+			if(branch.targetUIID == connectUIID || branch.sequenceActivity.activityUIID == connectUIID) {
+				if(activity.firstActivityUIID == branch.sequenceActivity.activityUIID && (branch.isStart || branch.isActivityless))
 					activity.defaultBranch = findNewDefaultBranch(activity, branch);
 				
 				removeBranch(branch.branchUIID);
@@ -289,7 +289,7 @@
 			if(SequenceActivity(children[i]) != branch.sequenceActivity) {
 				var branches:Array = getBranchesForActivityUIID(SequenceActivity(children[i]).activityUIID).myBranches;
 				for(var j=0; j<branches.length; j++) {
-					if(branches[j].isStart)
+					if(branches[j].isStart || branches[j].isActivityless)
 						return Branch(branches[j]);
 				}
 			}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r8cd5415d7ec415eb2591bfae35a8e484e5fa99e9 -r3029038bc804418124ff5e6ba6534a03a3382581
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 8cd5415d7ec415eb2591bfae35a8e484e5fa99e9)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
@@ -625,14 +625,14 @@
 		if(!cm.isActiveView(this)) return false;
 		
 		
-		if(b.direction == BranchConnector.DIR_SINGLE) cm.getCanvas().ddm.removeActivity(b.sequenceActivity.activityUIID);
-		else if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = null;
-		else if(b.direction == BranchConnector.DIR_TO_END) b.sequenceActivity.stopAfterActivity = true;
+		if(b.direction == BranchConnector.DIR_SINGLE) { continue;
+		} else if(b.direction == BranchConnector.DIR_FROM_START) { b.sequenceActivity.firstActivityUIID = null;
+		} else if(b.direction == BranchConnector.DIR_TO_END) { b.sequenceActivity.stopAfterActivity = true; }
 		
 		var r = cm.branchesDisplayed.remove(b.branchUIID);
 		r.removeMovieClip();
-		var s:Boolean = (r==null) ? false : true;
 		
+		var s:Boolean = (r==null) ? false : true;
 		return s;
 	}
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rb0054257349ffef3a3cd82ecd30eb6e5b48ad953 -r3029038bc804418124ff5e6ba6534a03a3382581
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision b0054257349ffef3a3cd82ecd30eb6e5b48ad953)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
@@ -643,6 +643,8 @@
 					for(var i=0; i<branchesToDelete.myBranches.length; i++) {
 						_canvasModel.getCanvas().removeBranch(branchesToDelete.myBranches[i].branchUIID);
 					}
+				} else if(bc.branch.direction == BranchConnector.DIR_SINGLE) {
+					_canvasModel.getCanvas().removeActivity(bc.branch.sequenceActivity.activityUIID);
 				} else {
 					_canvasModel.getCanvas().removeBranch(bc.branch.branchUIID);
 				}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r3029038bc804418124ff5e6ba6534a03a3382581
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision fc0f0136963cabbd4cad612035c80dc35c5717ff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
@@ -282,7 +282,6 @@
 		canvasModel.selectedItem = null;
 	}
 	
-	
 	/**
 	 * Show auto-save confirmation message
 	 *