Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r27d85ee30520b52c79e0b44ca00a475bf57a1de2 -r26f461d8762793126c0e8446a82ac831ae0c3619
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r27d85ee30520b52c79e0b44ca00a475bf57a1de2 -r26f461d8762793126c0e8446a82ac831ae0c3619
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -re2bfef3dced5d7bb35d73cfe1ed73708015c89d2 -r26f461d8762793126c0e8446a82ac831ae0c3619
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision e2bfef3dced5d7bb35d73cfe1ed73708015c89d2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 26f461d8762793126c0e8446a82ac831ae0c3619)
@@ -261,6 +261,8 @@
 								var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('act_lock_chk') : Dictionary.getValue('act_seq_lock_chk');
 								LFMessage.showMessageAlert(msg);
 							} else {
+								var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
+								
 								if(ca.activity.isGateActivity() && !optionalOnCanvas[i].activity.isSequenceBased){
 									activitySnapBack(ca);
 									var msg:String = Dictionary.getValue('cv_gateoptional_hit_chk');
@@ -269,7 +271,7 @@
 									activitySnapBack(ca);
 									var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity', [ca.activity.title]);
 									LFMessage.showMessageAlert(msg);
-								} else if(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID).hasBranches) {
+								} else if(branches.hasBranches && branches.target != null) {
 									activitySnapBack(ca);
 									var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity_no_branches', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity_no_branches', [ca.activity.title]);
 									LFMessage.showMessageAlert(msg);