Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v
diff -u -r1.23 -r1.24
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	15 Jun 2006 03:20:06 -0000	1.23
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	15 Jun 2006 04:44:05 -0000	1.24
@@ -570,7 +570,7 @@
 				}
 			}
 		}
-
+		
 		// clean up the links for any old transitions.
 		Iterator iter = learningDesign.getTransitions().iterator();
 		while (iter.hasNext()) {
@@ -887,10 +887,10 @@
 	 * but not a too activity. These cases should be picked up by Flash, but just in case.
 	 */
 	private void cleanupTransition(Transition transition) {
-		if ( transition.getFromActivity() != null ) {
+		if(transition.getFromActivity().getTransitionFrom().equals(transition)){
 			transition.getFromActivity().setTransitionFrom(null);
 		}
-		if ( transition.getToActivity() != null ) {
+		if(transition.getToActivity().getTransitionTo().equals(transition)){
 			transition.getToActivity().setTransitionTo(null);
 		}
 	}