Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java,v
diff -u -r1.57 -r1.57.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	20 Jun 2014 17:35:06 -0000	1.57
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	21 Oct 2014 10:30:48 -0000	1.57.2.1
@@ -454,12 +454,15 @@
 
     }
 
+    @SuppressWarnings("unchecked")
     private void addConditionGateActivityAttributes(ConditionGateActivity activity,
 	    ArrayList<BranchActivityEntryDTO> branchMappings) {
-	Iterator iter = activity.getBranchActivityEntries().iterator();
-	while (iter.hasNext()) {
-	    BranchActivityEntry ba = (BranchActivityEntry) iter.next();
-	    branchMappings.add(ba.getBranchActivityEntryDTO(toolActivityUIID));
+	if (activity.getBranchActivityEntries() != null) {
+	    Iterator<BranchActivityEntry> iter = activity.getBranchActivityEntries().iterator();
+	    while (iter.hasNext()) {
+		BranchActivityEntry ba = iter.next();
+		branchMappings.add(ba.getBranchActivityEntryDTO(toolActivityUIID));
+	    }
 	}
     }