Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as
===================================================================
diff -u -r5c5d0dde4257f652d199b84921bf1182260bf959 -rc432ce340c20635d8a3e76dd53127984460981ca
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision 5c5d0dde4257f652d199b84921bf1182260bf959)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision c432ce340c20635d8a3e76dd53127984460981ca)
@@ -73,14 +73,21 @@
 		if(_transition.mod_toUIID != null) toAct_mc = model.getActivityMCByUIID(_transition.mod_toUIID);
 		else toAct_mc = model.getActivityMCByUIID(_transition.toUIID);
 		
+		if (fromAct_mc instanceof CanvasOptionalActivity || toAct_mc instanceof CanvasOptionalActivity) {
+			MovieClipUtils.doLater(Proxy.create(this, setupEndPoints, toAct_mc, fromAct_mc));
+		}else {
+			setupEndPoints(toAct_mc, fromAct_mc);
+		}
+
+	}
+	
+	private function setupEndPoints(toAct_mc:MovieClip, fromAct_mc:MovieClip):Void {
 		var fromOTC:Object = getFromOTC(fromAct_mc);
 		var toOTC:Object = getToOTC(toAct_mc);
-
 		_startPoint = new Point(fromAct_mc.getActivity().xCoord + fromOTC.x, fromAct_mc.getActivity().yCoord + fromOTC.y);
 		_endPoint = new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y);
 		
 		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
-		
 	}
 
 	private function onPress():Void{