Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.103 -r1.104
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	2 Jul 2009 13:06:09 -0000	1.103
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	6 Jul 2009 14:14:06 -0000	1.104
@@ -1956,7 +1956,8 @@
 			    boolean transitionBreak = true;
 			    for (TransitionDTO transDto : transDtoList) {
 				// we deal with progress transitions only
-				if (transDto.getTransitionType().equals(Transition.PROGRESS_TRANSITION_TYPE)) {
+				if (transDto.getTransitionType() == null
+					|| transDto.getTransitionType().equals(Transition.PROGRESS_TRANSITION_TYPE)) {
 				    // find out the transition of current first
 				    // activity
 				    if (nextActId.equals(transDto.getFromActivityID())) {
@@ -2356,7 +2357,8 @@
     private Transition getTransition(TransitionDTO transDto, Map<Long, Activity> activityMapper) {
 
 	Transition trans = null;
-	if (transDto.getTransitionType().equals(Transition.DATA_TRANSITION_TYPE)) {
+	if (transDto.getTransitionType() != null
+		&& transDto.getTransitionType().equals(Transition.DATA_TRANSITION_TYPE)) {
 	    trans = new DataTransition();
 	} else {
 	    trans = new Transition();